Merge pull request #270 from Azure/AL-update-vwan

Update example 106 - virtual wan structure
Azure · Nov 2, 2021 · 1480242 · 1480242
2 parents ee05f94 + c8d7c87
commit 1480242
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 33 deletions.
diff --git a/caf_solution/scenario/networking/106-hub-virtual-wan-firewall/peerings.tfvars b/caf_solution/scenario/networking/106-hub-virtual-wan-firewall/peerings.tfvars
@@ -1,9 +1,8 @@
 virtual_hub_connections = {
   # Establish the peering with Virtual Hubs
   hub_rg1-TO-vnet_rg1 = {
-    vhub = {
-      virtual_wan_key = "vwan_re1"
-      virtual_hub_key = "hub_re1"
+    virtual_hub = {
+      key = "hub_re1"
     }
     vnet = {
       # If the virtual network is stored in another another landing zone, use the following attributes to refer the state file:
@@ -17,9 +16,8 @@ virtual_hub_connections = {
     internet_security_enabled                       = true
   }
   hub_rg2-TO-vnet_rg2 = {
-    vhub = {
-      virtual_wan_key = "vwan_re1"
-      virtual_hub_key = "hub_re2"
+    virtual_hub = {
+      key = "hub_re2"
     }
     vnet = {
       # If the virtual network is stored in another another landing zone, use the following attributes to refer the state file:

diff --git a/caf_solution/scenario/networking/106-hub-virtual-wan-firewall/virtual_hubs.tfvars b/caf_solution/scenario/networking/106-hub-virtual-wan-firewall/virtual_hubs.tfvars
@@ -0,0 +1,40 @@
+virtual_hubs = {
+  hub_re1 = {
+    virtual_wan = {
+      key = "vwan_re1"
+    }
+    resource_group = {
+      key = "hub_re1"
+    }
+    hub_name           = "hub-re1"
+    region             = "region1"
+    hub_address_prefix = "10.0.3.0/24"
+    deploy_firewall    = false
+    deploy_p2s         = false
+    p2s_config         = {}
+    deploy_s2s         = false
+    s2s_config         = {}
+    deploy_er          = false
+    er_config          = {}
+
+  }
+  hub_re2 = {
+    virtual_wan = {
+      key = "vwan_re1"
+    }
+    resource_group = {
+      key = "hub_re2"
+    }
+    hub_name           = "hub-re2"
+    region             = "region2"
+    hub_address_prefix = "10.0.4.0/24"
+    deploy_firewall    = false
+    deploy_p2s         = false
+    p2s_config         = {}
+    deploy_s2s         = false
+    s2s_config         = {}
+    deploy_er          = false
+    er_config          = {}
+  }
+}
+
diff --git a/caf_solution/scenario/networking/106-hub-virtual-wan-firewall/virtual_wan.tfvars b/caf_solution/scenario/networking/106-hub-virtual-wan-firewall/virtual_wan.tfvars
@@ -4,33 +4,6 @@ virtual_wans = {
     name               = "contosovWAN-re1"
     region             = "region1"
 
-    hubs = {
-      hub_re1 = {
-        hub_name           = "hub-re1"
-        region             = "region1"
-        hub_address_prefix = "10.0.3.0/24"
-        deploy_firewall    = false
-        deploy_p2s         = false
-        p2s_config         = {}
-        deploy_s2s         = false
-        s2s_config         = {}
-        deploy_er          = false
-        er_config          = {}
-
-      }
-      hub_re2 = {
-        hub_name           = "hub-re2"
-        region             = "region2"
-        hub_address_prefix = "10.0.4.0/24"
-        deploy_firewall    = false
-        deploy_p2s         = false
-        p2s_config         = {}
-        deploy_s2s         = false
-        s2s_config         = {}
-        deploy_er          = false
-        er_config          = {}
-      }
-    }
   }
 }