chore: still trying to figure it out with some variations on the config

dwmkerr · Mar 15, 2018 · fe28b0a · fe28b0a
1 parent 6d6e231
commit fe28b0a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/inventory.template.cfg b/inventory.template.cfg
@@ -7,6 +7,7 @@
 # Create an OSEv3 group that contains the masters and nodes groups
 [OSEv3:children]
 masters
+etcd
 nodes
 
 # Set variables common for all OSEv3 hosts
@@ -43,10 +44,12 @@ openshift_clusterid=${cluster_id}
 #  - https://github.com/openshift/openshift-ansible/issues/5534
 #  - https://github.com/openshift/openshift-ansible/issues/6087
 #  - https://github.com/coreos/etcd/issues/8603#issuecomment-341508947
-etcd_version=3.1.9
+# etcd_version=3.1.9
 # etcd_version=3.2.7
-osm_cluster_network_cidr=11.0.0.0/16
-
+# osm_cluster_network_cidr=11.0.0.0/16
+openshift_enable_service_catalog=false
+template_service_broker_install=false
+openshift_repos_enable_testing=true
 
 # Create the masters host group. Note that due do:
 #   https://github.com/dwmkerr/terraform-aws-openshift/issues/40

diff --git a/modules/openshift/00-variables.tf b/modules/openshift/00-variables.tf
@@ -34,3 +34,4 @@ variable "cluster_name" {
 variable "cluster_id" {
   description = "ID of the cluster, e.g: 'openshift-cluster-us-east-1'. Useful when running multiple clusters in the same AWS account."
 }
+
diff --git a/modules/openshift/01-tags.tf b/modules/openshift/01-tags.tf
@@ -24,4 +24,3 @@ locals {
     "kubernetes.io/cluster/${var.cluster_name}", "${var.cluster_id}"
   )}"
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,3 +34,4 @@ variable "cluster_name" {
		variable "cluster_id" {
		description = "ID of the cluster, e.g: 'openshift-cluster-us-east-1'. Useful when running multiple clusters in the same AWS account."
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,3 @@ locals {
		"kubernetes.io/cluster/${var.cluster_name}", "${var.cluster_id}"
		)}"
		}