Merge pull request #3494 from LorbusChris/fix-ign-filemode

upi: Post TF 0.12.x migration fixups
openshift · Jun 5, 2020 · 3d59b56 · 3d59b56
2 parents 5face7c + 10f82ed
commit 3d59b56
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/docs/user/vsphere/install_upi.md b/docs/user/vsphere/install_upi.md
@@ -411,11 +411,12 @@ cd test-vsphere
 create_tfvars.sh
 ```
 
-At a minimum, you will need to provide values for the following variables.
-* bootstrap_ignition_url
-* bootstrap_ip
-* control_plane_ips
-* compute_ips
+At a minimum, you need to set values for the following variables.
+* cluster_id
+* cluster_domain
+* vsphere_user
+* vsphere_password
+* ipam_token OR bootstrap_ip, control_plane_ips, and compute_ips
 
 Move the `tfvars` file to the directory with the example Terraform.
 

diff --git a/upi/vsphere/README.md b/upi/vsphere/README.md
@@ -36,9 +36,6 @@ There is an example terraform.tfvars file in this directory named terraform.tfva
 * vsphere_user
 * vsphere_password
 * ipam_token OR bootstrap_ip, control_plane_ips, and compute_ips
-* bootstrap_ignition_url
-* control_plane_ignition
-* compute_ignition
 
 The bootstrap ignition config must be placed in a location that will be accessible by the bootstrap machine. For example, you could store the bootstrap ignition config in a gist.
 

diff --git a/upi/vsphere/lb/main.tf b/upi/vsphere/lb/main.tf
@@ -6,7 +6,7 @@ data "ignition_systemd_unit" "haproxy" {
 data "ignition_file" "haproxy" {
   filesystem = "root"
   path       = "/etc/haproxy/haproxy.conf"
-  mode       = 0755
+  mode       = "420" // 0644
   content {
     content = templatefile("${path.module}/haproxy.tmpl", {
       lb_ip_address = var.lb_ip_address,

diff --git a/upi/vsphere/terraform.tfvars.example b/upi/vsphere/terraform.tfvars.example
@@ -38,18 +38,11 @@ control_plane_count = 3
 // The number of compute VMs to create. Default is 3.
 compute_count = 3
 
-// URL of the bootstrap ignition. This needs to be publicly accessible so that the bootstrap machine can pull the ignition.
-bootstrap_ignition_url = "URL_FOR_YOUR_BOOTSTRAP_IGNITION"
-
-// Ignition config for the control plane machines. You should copy the contents of the master.ign generated by the installer.
-control_plane_ignition = <<END_OF_MASTER_IGNITION
-Copy the master ignition generated by the installer here.
-END_OF_MASTER_IGNITION
-
-// Ignition config for the compute machines. You should copy the contents of the worker.ign generated by the installer.
-compute_ignition = <<END_OF_WORKER_IGNITION
-Copy the worker ignition generated by the installer here.
-END_OF_WORKER_IGNITION
+// Ignition config path for the control plane machines
+control_plane_ignition_path = "./master.ign"
+
+// Ignition config path for the compute machines
+compute_ignition_path = "./worker.ign"
 
 
 // Set ipam and ipam_token if you want to use the IPAM server to reserve IP