fix(module/vmseries): Reuse of existing public IP for 1 NIC caused cr…

…eating ephemeral IPs for other NICs (#232)
PaloAltoNetworks · Dec 19, 2023 · 27bcc01 · 27bcc01
1 parent 032c896
commit 27bcc01
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 1 deletion.
diff --git a/examples/multi_nic_common/main.tf b/examples/multi_nic_common/main.tf
@@ -144,6 +144,7 @@ module "vmseries" {
       subnetwork       = module.vpc[v.vpc_network_key].subnetworks[v.subnetwork_key].self_link
       private_ip       = v.private_ip
       create_public_ip = try(v.create_public_ip, false)
+      public_ip        = try(v.public_ip, null)
   }]
 }
 

diff --git a/examples/standalone_vmseries_with_metadata_bootstrap/main.tf b/examples/standalone_vmseries_with_metadata_bootstrap/main.tf
@@ -43,5 +43,6 @@ module "vmseries" {
       subnetwork       = module.vpc[v.vpc_network_key].subnetworks[v.subnetwork_key].self_link
       private_ip       = v.private_ip
       create_public_ip = try(v.create_public_ip, false)
+      public_ip        = try(v.public_ip, null)
   }]
 }
diff --git a/examples/vmseries_ha/main.tf b/examples/vmseries_ha/main.tf
@@ -148,6 +148,7 @@ module "vmseries" {
       subnetwork       = module.vpc[v.vpc_network_key].subnetworks[v.subnetwork_key].self_link
       private_ip       = v.private_ip
       create_public_ip = try(v.create_public_ip, false)
+      public_ip        = try(v.public_ip, null)
   }]
 }
 

diff --git a/examples/vpc_peering_common/main.tf b/examples/vpc_peering_common/main.tf
@@ -142,6 +142,7 @@ module "vmseries" {
       subnetwork       = module.vpc[v.vpc_network_key].subnetworks[v.subnetwork_key].self_link
       private_ip       = v.private_ip
       create_public_ip = try(v.create_public_ip, false)
+      public_ip        = try(v.public_ip, null)
   }]
 }
 

diff --git a/examples/vpc_peering_common_with_autoscale/main.tf b/examples/vpc_peering_common_with_autoscale/main.tf
@@ -99,6 +99,7 @@ module "autoscale" {
     {
       subnetwork       = module.vpc[v.vpc_network_key].subnetworks[v.subnetwork_key].self_link
       create_public_ip = try(v.create_public_ip, false)
+      public_ip        = try(v.public_ip, null)
   }]
   metadata = merge(
     try(each.value.bootstrap_options, {}),

diff --git a/examples/vpc_peering_common_with_network_tags/main.tf b/examples/vpc_peering_common_with_network_tags/main.tf
@@ -143,6 +143,7 @@ module "vmseries" {
       subnetwork       = module.vpc[v.vpc_network_key].subnetworks[v.subnetwork_key].self_link
       private_ip       = v.private_ip
       create_public_ip = try(v.create_public_ip, false)
+      public_ip        = try(v.public_ip, null)
   }]
 }
 

diff --git a/examples/vpc_peering_dedicated/main.tf b/examples/vpc_peering_dedicated/main.tf
@@ -142,6 +142,7 @@ module "vmseries" {
       subnetwork       = module.vpc[v.vpc_network_key].subnetworks[v.subnetwork_key].self_link
       private_ip       = v.private_ip
       create_public_ip = try(v.create_public_ip, false)
+      public_ip        = try(v.public_ip, null)
   }]
 }
 

diff --git a/examples/vpc_peering_dedicated_with_autoscale/main.tf b/examples/vpc_peering_dedicated_with_autoscale/main.tf
@@ -99,6 +99,7 @@ module "autoscale" {
     {
       subnetwork       = module.vpc[v.vpc_network_key].subnetworks[v.subnetwork_key].self_link
       create_public_ip = try(v.create_public_ip, false)
+      public_ip        = try(v.public_ip, null)
   }]
   metadata = merge(
     try(each.value.bootstrap_options, {}),

diff --git a/modules/vmseries/main.tf b/modules/vmseries/main.tf
@@ -7,7 +7,7 @@ locals {
       nat_ip                 = try(v.public_ip, google_compute_address.public[k].address, null)
       public_ptr_domain_name = try(v.public_ptr_domain_name, google_compute_address.public[k].public_ptr_domain_name, null)
     }
-    if can(v.public_ip) || local.create_public_ip[k]
+    if try(v.public_ip, null) != null || local.create_public_ip[k]
   }
 }