OCTOPUS-558: remove_lbs script is updated

Signed-off-by: Chandan Abhyankar <chandan.abhyankar@gmail.com>
IBM · Dec 21, 2023 · 59ed178 · 59ed178
1 parent f151f94
commit 59ed178
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/modules/7_post/ibmcloud_lb/ibmcloud_lb.tf b/modules/7_post/ibmcloud_lb/ibmcloud_lb.tf
@@ -11,16 +11,20 @@ locals {
 resource "null_resource" "remove_lbs" {
 
   triggers = {
-    count_1           = var.worker_1["count"]
-    count_2           = var.worker_2["count"]
-    count_3           = var.worker_3["count"]
-    user              = var.rhel_username
-    timeout           = "${var.connection_timeout}m"
-    name_prefix       = "${var.name_prefix}"
-    private_key       = sensitive(file(var.private_key_file))
-    host              = var.bastion_public_ip
-    agent             = var.ssh_agent
-    ansible_post_path = local.ansible_post_path
+    count_1             = var.worker_1["count"]
+    count_2             = var.worker_2["count"]
+    count_3             = var.worker_3["count"]
+    user                = var.rhel_username
+    timeout             = "${var.connection_timeout}m"
+    name_prefix         = "${var.name_prefix}"
+    private_key         = sensitive(file(var.private_key_file))
+    host                = var.bastion_public_ip
+    agent               = var.ssh_agent
+    ansible_post_path   = local.ansible_post_path
+    ibmcloud_api_key    = var.ibmcloud_api_key
+    vpc_region          = var.vpc_region
+    resource_group_name = var.resource_group_name
+    vpc_name            = var.vpc_name
   }
 
   connection {
@@ -49,7 +53,8 @@ EOF
     on_failure = continue
     inline = [<<EOF
 cd /root/ocp4-upi-compute-powervs-ibmcloud/intel/lbs/
-bash remove_lbs.sh
+bash remove_lbs.sh "${self.triggers.ibmcloud_api_key}" "${self.triggers.vpc_region}" "${self.triggers.resource_group_name}" "${self.triggers.vpc_name}"
+
 EOF
     ]
   }

diff --git a/modules/7_post/post.tf b/modules/7_post/post.tf
@@ -208,9 +208,9 @@ module "haproxy_lb_support" {
 
 # Dev Note: we only execute when CIS, Security Groups and Load Balancers are used
 module "ibmcloud_lb_support" {
-  count               = var.ibm_cloud_cis ? 1 : 0
-  depends_on          = [null_resource.patch_nfs_arch_ppc64le]
-  source              = "./ibmcloud_lb"
+  count      = var.ibm_cloud_cis ? 1 : 0
+  depends_on = [null_resource.patch_nfs_arch_ppc64le]
+  source     = "./ibmcloud_lb"
 
   ssh_agent           = var.ssh_agent
   rhel_username       = var.rhel_username