fmt and remove numeric value from bootstrap VM

openshift · Mar 25, 2019 · bbb0f9b · bbb0f9b
1 parent fa713b4
commit bbb0f9b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/upi/vsphere/bootstrap/main.tf b/upi/vsphere/bootstrap/main.tf
@@ -23,7 +23,7 @@ data "vsphere_virtual_machine" "template" {
 }
 
 resource "vsphere_virtual_machine" "vm" {
-  name             = "bootstrap1"
+  name             = "${var.cluster_id}-bootstrap"
   resource_pool_id = "${var.resource_pool_id}"
   datastore_id     = "${data.vsphere_datastore.datastore.id}"
   num_cpus         = "${var.num_cpus}"
@@ -46,8 +46,6 @@ resource "vsphere_virtual_machine" "vm" {
   }
 
   vapp {
-    properties {
-      "guestinfo.coreos.config.data" = 
-    }
+    properties {}
   }
 }
diff --git a/upi/vsphere/main.tf b/upi/vsphere/main.tf
@@ -9,7 +9,7 @@ module "network" {
   source = "./network"
 
   # TODO Pass in and check the base domain and cluster domain to look for A records
-  machine_cidr = "${var.machine_cidr}"
+  machine_cidr   = "${var.machine_cidr}"
   master_count   = "${var.master_count}"
   worker_count   = "${var.worker_count}"
   base_domain    = "${var.base_domain}"

diff --git a/upi/vsphere/masters/main.tf b/upi/vsphere/masters/main.tf
@@ -24,7 +24,7 @@ data "vsphere_virtual_machine" "template" {
 
 resource "vsphere_virtual_machine" "vm" {
   count            = "${var.master_count}"
-  name             = "master-${count.index + 1}"
+  name             = "${var.cluster_id}-master-${count.index + 1}"
   resource_pool_id = "${var.resource_pool_id}"
   datastore_id     = "${data.vsphere_datastore.datastore.id}"
   num_cpus         = "${var.num_cpus}"

diff --git a/upi/vsphere/network/main.tf b/upi/vsphere/network/main.tf
@@ -2,7 +2,7 @@ data "external" "ping" {
   program = ["bash", "${path.root}/network/cidr_to_ip.sh"]
 
   query = {
-    cidr = "${var.machine_cidr}"
+    cidr         = "${var.machine_cidr}"
     master_count = "${var.master_count}"
     worker_count = "${var.worker_count}"
   }

diff --git a/upi/vsphere/workers/main.tf b/upi/vsphere/workers/main.tf
@@ -24,7 +24,7 @@ data "vsphere_virtual_machine" "template" {
 
 resource "vsphere_virtual_machine" "vm" {
   count            = "${var.worker_count}"
-  name             = "worker-${count.index + 1}"
+  name             = "${var.cluster_id}-worker-${count.index + 1}"
   resource_pool_id = "${var.resource_pool_id}"
   datastore_id     = "${data.vsphere_datastore.datastore.id}"
   num_cpus         = "${var.num_cpus}"