Changes for OCTOPUS-532 and 534

Signed-off-by: Chandan Abhyankar <[email protected]>

modules/1_vpc_prepare/subnets.tf

@@ -33,9 +33,10 @@ resource "ibm_is_public_gateway" "pg_worker_zone_1" {
   depends_on = [
     ibm_is_subnet.subnet_worker_zone_1
   ]
-  name = "pg-worker-zone-1"
-  vpc  = data.ibm_is_vpc.vpc.id
-  zone = var.worker_1["zone"]
+  name           = "pg-worker-zone-1"
+  vpc            = data.ibm_is_vpc.vpc.id
+  zone           = var.worker_1["zone"]
+  resource_group = data.ibm_is_vpc.vpc.resource_group
 
   timeouts {
     create = "10m"
@@ -50,7 +51,7 @@ resource "ibm_is_subnet_public_gateway_attachment" "attach_pg_worker_zone_1" {
   subnet         = ibm_is_subnet.subnet_worker_zone_1[0].id
   public_gateway = ibm_is_public_gateway.pg_worker_zone_1[0].id
 }
-
+/*
 ### Zone 2
 
 resource "ibm_is_vpc_address_prefix" "address_prefix_worker_zone_2" {
@@ -78,9 +79,10 @@ resource "ibm_is_public_gateway" "pg_worker_zone_2" {
   depends_on = [
     ibm_is_subnet.subnet_worker_zone_2
   ]
-  name = "pg-worker-zone-2"
-  vpc  = data.ibm_is_vpc.vpc.id
-  zone = var.worker_2["zone"]
+  name           = "pg-worker-zone-2"
+  vpc            = data.ibm_is_vpc.vpc.id
+  zone           = var.worker_2["zone"]
+  resource_group = data.ibm_is_vpc.vpc.resource_group
 
   timeouts {
     create = "10m"
@@ -122,9 +124,10 @@ resource "ibm_is_public_gateway" "pg_worker_zone_3" {
   depends_on = [
     ibm_is_subnet.subnet_worker_zone_3
   ]
-  name = "pg-worker-zone-3"
-  vpc  = data.ibm_is_vpc.vpc.id
-  zone = var.worker_3["zone"]
+  name           = "pg-worker-zone-3"
+  vpc            = data.ibm_is_vpc.vpc.id
+  zone           = var.worker_3["zone"]
+  resource_group = data.ibm_is_vpc.vpc.resource_group
 
   timeouts {
     create = "10m"
@@ -138,4 +141,6 @@ resource "ibm_is_subnet_public_gateway_attachment" "attach_pg_worker_zone_3" {
   ]
   subnet         = ibm_is_subnet.subnet_worker_zone_3[0].id
   public_gateway = ibm_is_public_gateway.pg_worker_zone_3[0].id
-}
+}
+
+*/

modules/7_post/post.tf

@@ -82,7 +82,7 @@ resource "null_resource" "approve_and_issue" {
 
   #create approval script
   provisioner "file" {
-    content     = "${path.module}/files/approve_and_issue.sh"
+    source      = "${path.module}/files/approve_and_issue.sh"
     destination = "${local.ansible_post_path}/approve_and_issue.sh"
   }