Merge pull request #314 from LaurentLesle/aci_network

Aci network

caf_solution/local.networking.tf

@@ -2,9 +2,9 @@ locals {
   networking = merge(
     var.networking,
     {
-      application_gateway_platforms                           = var.application_gateway_platforms
-      application_gateway_applications_v1                     = var.application_gateway_applications_v1
       application_gateway_applications                        = var.application_gateway_applications
+      application_gateway_applications_v1                     = var.application_gateway_applications_v1
+      application_gateway_platforms                           = var.application_gateway_platforms
       application_gateway_waf_policies                        = var.application_gateway_waf_policies
       application_gateways                                    = var.application_gateways
       application_security_groups                             = var.application_security_groups
@@ -15,8 +15,8 @@ locals {
       azurerm_firewall_policy_rule_collection_groups          = var.azurerm_firewall_policy_rule_collection_groups
       azurerm_firewalls                                       = var.azurerm_firewalls
       azurerm_routes                                          = var.azurerm_routes
-      cdn_profiles                                            = var.cdn_profiles
       cdn_endpoints                                           = var.cdn_endpoints
+      cdn_profiles                                            = var.cdn_profiles
       ddos_services                                           = var.ddos_services
       dns_zone_records                                        = var.dns_zone_records
       dns_zones                                               = var.dns_zones
@@ -46,10 +46,11 @@ locals {
       virtual_hubs                                            = var.virtual_hubs
       virtual_network_gateway_connections                     = var.virtual_network_gateway_connections
       virtual_network_gateways                                = var.virtual_network_gateways
+      virtual_subnets                                         = var.virtual_subnets
       virtual_wans                                            = var.virtual_wans
       vnet_peerings                                           = var.vnet_peerings
       vnets                                                   = var.vnets
-      virtual_subnets                                         = var.virtual_subnets
+      vpn_gateway_connections                                 = var.vpn_gateway_connections
       vpn_sites                                               = var.vpn_sites
     }
   )

templates/enterprise-scale/contoso/application/orion-landingzone/deployments.yaml → templates/enterprise-scale/contoso/asvm/orion-landingzone/deployments.yaml

@@ -12,12 +12,12 @@ deployments:
           platform:
             asvm:
 
-  it_dna_orion_dev:
+  orion_dev:
     subscriptions:
       landingzone:
         key:
           asvm:
-            it_dna_orion_dev: subscriptions
+            orion_dev: subscriptions
         global_settings_key:
           asvm:
             asvm_storage_containers: subscriptions
@@ -29,13 +29,13 @@ deployments:
       landingzone:
         key:
           asvm:
-            it_dna_orion_dev: resources
+            orion_dev: resources
         global_settings_key:
           platform:
             virtual_hubs: non_prod
         remote_tfstates:
           asvm:
-            it_dna_orion_dev: subscriptions
+            orion_dev: subscriptions
             asvm_storage_containers: subscriptions
           platform:
             virtual_hubs: non_prod
@@ -44,12 +44,12 @@ deployments:
             asvm:
             azurerm_firewalls: non_prod
 
-  it_dna_orion_prod:
+  orion_prod:
     subscriptions:
       landingzone:
         key:
           asvm:
-            it_dna_orion_prod: subscriptions
+            orion_prod: subscriptions
         global_settings_key:
           asvm:
             asvm_storage_containers: subscriptions
@@ -61,13 +61,13 @@ deployments:
       landingzone:
         key:
           asvm:
-            it_dna_orion_prod: resources
+            orion_prod: resources
         global_settings_key:
           platform:
             virtual_hubs: prod
         remote_tfstates:
           asvm:
-            it_dna_orion_prod: subscriptions
+            orion_prod: subscriptions
             asvm_storage_containers: subscriptions
           platform:
             virtual_hubs: prod

templates/enterprise-scale/contoso/application/orion-landingzone/resources.asvm.yaml → templates/enterprise-scale/contoso/asvm/orion-landingzone/resources.asvm.yaml

@@ -3,7 +3,7 @@ gitops:
 
 subscriptions:
 
-  it_dna_orion_dev:
+  orion_dev:
 
     resource_groups:
       rg:
@@ -458,8 +458,8 @@ subscriptions:
 
       built_in_role_mapping:
         subscriptions:
-          it_dna_orion_dev:
-            lz_key: it_dna_orion_dev_subscriptions
+          orion_dev:
+            lz_key: orion_dev_subscriptions
             Contributor:
               azuread_service_principals:
                 keys:
@@ -486,21 +486,21 @@ subscriptions:
                 keys:
                   - sp_LZContributors
         storage_containers:
-          it_dna_orion_prod_level3:
-            lz_key: it_dna_orion_storage_containers
+          orion_prod_level3:
+            lz_key: orion_storage_containers
             Storage Blob Data Contributor:
               azuread_service_principals:
                 keys:
                   - sp_LZContributors
-          it_dna_orion_dev_level4:
-            lz_key: it_dna_orion_storage_containers
+          orion_dev_level4:
+            lz_key: orion_storage_containers
             Storage Blob Data Contributor:
               azuread_service_principals:
                 keys:
                   - sp_LZContributors
 
 
-  it_dna_orion_prod:
+  orion_prod:
 
     resource_groups:
       rg:
@@ -972,8 +972,8 @@ subscriptions:
 
       built_in_role_mapping:
         subscriptions:
-          it_dna_orion_prod:
-            lz_key: it_dna_orion_prod_subscriptions
+          orion_prod:
+            lz_key: orion_prod_subscriptions
             Contributor:
               azuread_service_principals:
                 keys:
@@ -1000,14 +1000,14 @@ subscriptions:
                 keys:
                   - sp_LZContributors
         storage_containers:
-          it_dna_orion_prod_level3:
-            lz_key: it_dna_orion_storage_containers
+          orion_prod_level3:
+            lz_key: orion_storage_containers
             Storage Blob Data Contributor:
               azuread_service_principals:
                 keys:
                   - sp_LZContributors
-          it_dna_orion_prod_level4:
-            lz_key: it_dna_orion_storage_containers
+          orion_prod_level4:
+            lz_key: orion_storage_containers
             Storage Blob Data Contributor:
               azuread_service_principals:
                 keys:

templates/enterprise-scale/contoso/application/orion-landingzone/subscriptions.asvm.yaml → templates/enterprise-scale/contoso/asvm/orion-landingzone/subscriptions.asvm.yaml

@@ -2,12 +2,12 @@ gitops:
   landingzones: aci_network
 
 subscriptions:
-  it_dna_orion_dev:
-    it_dna_orion_dev:
+  orion_dev:
+    orion_dev:
       name: orion-dev
       management_group_suffix: non-prod
 
-  it_dna_orion_prod:
-    it_dna_orion_prod:
+  orion_prod:
+    orion_prod:
       name: orion-prod
       management_group_suffix: prod

templates/enterprise-scale/contoso/asvm/orion-landingzone/tfstates.asvm.yaml

@@ -0,0 +1,29 @@
+# ### orion ###
+tfstates:
+  asvm:
+    asvm_storage_containers:
+      subscriptions:
+        lz_key_name: orion_storage_containers
+        tfstate: orion_storage_containers.tfstate
+      workspace: tfstate
+      level: level3
+
+    orion_dev:
+      subscriptions:
+        lz_key_name: orion_dev_subscriptions
+        tfstate: orion_dev_subscriptions.tfstate
+      resources:
+        lz_key_name: orion_dev_resources
+        tfstate: orion_dev_resources.tfstate
+      workspace: orion-dev
+      level: level3
+
+    orion_prod:
+      subscriptions:
+        lz_key_name: orion_prod_subscriptions
+        tfstate: orion_prod_subscriptions.tfstate
+      resources:
+        lz_key_name: orion_prod_resources
+        tfstate: orion_prod_resources.tfstate
+      workspace: orion-prod
+      level: level3