Changes for #558 - Incorporated review comments from Paul

Signed-off-by: Chandan Abhyankar <chandan.abhyankar@gmail.com>
IBM · Dec 6, 2023 · 37d793c · 37d793c
1 parent 594da60
commit 37d793c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/main.tf b/main.tf
@@ -30,7 +30,7 @@ locals {
   name_prefix                 = var.name_prefix == "" ? "mac-${random_id.label[0].hex}" : "${var.name_prefix}"
   node_prefix                 = var.use_zone_info_for_names ? "${var.powervs_zone}-" : ""
   vpc_name                    = var.vpc_create ? "${local.name_prefix}-vpc" : var.vpc_name
-  skip_transit_gateway_create = var.ibm_cloud_cis == true ? true : false
+  skip_transit_gateway_create = var.ibm_cloud_cis
 }
 
 ### Prepares the VPC Support Machine

diff --git a/modules/7_post/haproxy_lb/haproxy_lb.tf b/modules/7_post/haproxy_lb/haproxy_lb.tf
@@ -9,7 +9,6 @@ locals {
 
 # Dev Note: only on destroy - restore the load balancers
 resource "null_resource" "remove_lbs" {
-  #  depends_on = [null_resource.patch_nfs_arch_ppc64le]
 
   triggers = {
     count_1           = var.worker_1["count"]
@@ -56,9 +55,8 @@ EOF
   }
 }
 
-
 resource "null_resource" "updating_load_balancers" {
-  #  depends_on = [null_resource.patch_nfs_arch_ppc64le, null_resource.remove_lbs]
+  depends_on = [null_resource.remove_lbs]
   connection {
     type        = "ssh"
     user        = var.rhel_username

diff --git a/modules/7_post/post.tf b/modules/7_post/post.tf
@@ -188,7 +188,8 @@ EOF
 }
 
 module "haproxy_lb_support" {
-  source = "./haproxy_lb"
+  depends_on = [null_resource.patch_nfs_arch_ppc64le]
+  source     = "./haproxy_lb"
 
   ssh_agent          = var.ssh_agent
   rhel_username      = var.rhel_username

diff --git a/modules/7_post/variables.tf b/modules/7_post/variables.tf
@@ -14,4 +14,4 @@ variable "name_prefix" {}
 variable "worker_1" {}
 variable "worker_2" {}
 variable "worker_3" {}
-variable "cicd_image_pruner_cleanup" {}
+variable "cicd_image_pruner_cleanup" {}
diff --git a/var.tfvars b/var.tfvars
@@ -28,6 +28,6 @@ worker_3 = { count = "0", profile = "cx2-8x16", "zone" = "au-syd-3" }
 public_key_file  = "data/id_rsa.pub"
 private_key_file = "data/id_rsa"
 
-# Required for Ignition and Automation to Run
-powervs_bastion_private_ip = "<Private IP Address of Bastion> e.g. 192.168.200.x"
+# Required for Ignition and Automation to Run (powervs_bastion_private_ip generally belongs to 192.168.200.x range)
+powervs_bastion_private_ip = "<Private IP Address of Bastion>"
 powervs_bastion_ip         = "<Public IP Address of Bastion>"
diff --git a/variables.tf b/variables.tf
@@ -354,7 +354,7 @@ variable "skip_route_creation" {
 
 variable "ibm_cloud_cis" {
   type        = bool
-  description = "ibm_cloud_cis flag which indicates LoadBalancer and Security Groups are created by UPI automation"
+  description = "indicates LoadBalancer and Security Groups are created by UPI automation"
   default     = false
 }