Skip to content

Commit d23e47a

Browse files
jaredfholgatejaredfholgate
authored
fix: resource group dependencies (#255)
# Pull Request ## Description Update the config files for complete_multi_region to reflect bug fixes in the starter module ## License By submitting this pull request, I confirm that my contribution is made under the terms of the projects associated license.
1 parent b560259 commit d23e47a

File tree

4 files changed

+43
-38
lines changed

4 files changed

+43
-38
lines changed

‎docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-multi-region.yaml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ hub_and_spoke_vnet_settings:
2929
ddos_protection_plan:
3030
location: ${starter_location_01}
3131
name: ddos-hub-${starter_location_01}
32-
resource_group_name: rg-hub-ddos-${starter_location_01}
32+
resource_group_name: ${connectivity_resource_group_ddos}
3333
hub_and_spoke_vnet_virtual_networks:
3434
primary:
3535
hub_virtual_network:
@@ -53,16 +53,19 @@ hub_and_spoke_vnet_virtual_networks:
5353
location: ${starter_location_01}
5454
name: vnet-hub-${starter_location_01}
5555
resource_group_creation_enabled: false
56-
resource_group_name: rg-hub-${starter_location_01}
56+
resource_group_name: ${connectivity_resource_group_vnet_primary}
5757
subnets:
5858
virtual_network_gateway:
5959
address_prefixes:
6060
- 10.0.1.0/24
6161
assign_generated_route_table: false
6262
name: GatewaySubnet
63+
tags:
64+
deployment: terraform
65+
source: Azure Landing Zones Accelerator
6366
private_dns_zones:
6467
is_primary: true
65-
resource_group_name: rg-hub-dns-${starter_location_01}
68+
resource_group_name: ${connectivity_resource_group_dns}
6669
virtual_network_gateways:
6770
express_route:
6871
ip_configurations:
@@ -108,16 +111,19 @@ hub_and_spoke_vnet_virtual_networks:
108111
location: ${starter_location_02}
109112
name: vnet-hub-${starter_location_02}
110113
resource_group_creation_enabled: false
111-
resource_group_name: rg-hub-${starter_location_02}
114+
resource_group_name: ${connectivity_resource_group_vnet_secondary}
112115
subnets:
113116
virtual_network_gateway:
114117
address_prefixes:
115118
- 10.1.1.0/24
116119
assign_generated_route_table: false
117120
name: GatewaySubnet
121+
tags:
122+
deployment: terraform
123+
source: Azure Landing Zones Accelerator
118124
private_dns_zones:
119125
is_primary: false
120-
resource_group_name: rg-hub-dns-${starter_location_01}
126+
resource_group_name: ${connectivity_resource_group_dns}
121127
virtual_network_gateways:
122128
express_route:
123129
ip_configurations:
@@ -152,10 +158,10 @@ management_settings_es:
152158
azurerm_resource_group:
153159
ddos:
154160
${starter_location_01}:
155-
name: rg-hub-ddos-${starter_location_01}
161+
name: ${connectivity_resource_group_ddos}
156162
dns:
157163
${starter_location_01}:
158-
name: rg-hub-dns-${starter_location_01}
164+
name: ${connectivity_resource_group_dns}
159165
settings:
160166
ddos_protection_plan:
161167
config:
@@ -189,4 +195,3 @@ management_settings_es:
189195
subscription_id_connectivity: ${subscription_id_connectivity}
190196
subscription_id_identity: ${subscription_id_identity}
191197
subscription_id_management: ${subscription_id_management}
192-
management_use_avm: false

‎docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-single-region.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ hub_and_spoke_vnet_settings:
2626
ddos_protection_plan:
2727
location: ${starter_location_01}
2828
name: ddos-hub-${starter_location_01}
29-
resource_group_name: rg-hub-ddos-${starter_location_01}
29+
resource_group_name: ${connectivity_resource_group_ddos}
3030
hub_and_spoke_vnet_virtual_networks:
3131
primary:
3232
hub_virtual_network:
@@ -50,16 +50,19 @@ hub_and_spoke_vnet_virtual_networks:
5050
location: ${starter_location_01}
5151
name: vnet-hub-${starter_location_01}
5252
resource_group_creation_enabled: false
53-
resource_group_name: rg-hub-${starter_location_01}
53+
resource_group_name: ${connectivity_resource_group_vnet_primary}
5454
subnets:
5555
virtual_network_gateway:
5656
address_prefixes:
5757
- 10.0.1.0/24
5858
assign_generated_route_table: false
5959
name: GatewaySubnet
60+
tags:
61+
deployment: terraform
62+
source: Azure Landing Zones Accelerator
6063
private_dns_zones:
6164
is_primary: true
62-
resource_group_name: rg-hub-dns-${starter_location_01}
65+
resource_group_name: ${connectivity_resource_group_dns}
6366
virtual_network_gateways:
6467
express_route:
6568
ip_configurations:
@@ -94,10 +97,10 @@ management_settings_es:
9497
azurerm_resource_group:
9598
ddos:
9699
${starter_location_01}:
97-
name: rg-hub-ddos-${starter_location_01}
100+
name: ${connectivity_resource_group_ddos}
98101
dns:
99102
${starter_location_01}:
100-
name: rg-hub-dns-${starter_location_01}
103+
name: ${connectivity_resource_group_dns}
101104
settings:
102105
ddos_protection_plan:
103106
config:
@@ -131,4 +134,3 @@ management_settings_es:
131134
subscription_id_connectivity: ${subscription_id_connectivity}
132135
subscription_id_identity: ${subscription_id_identity}
133136
subscription_id_management: ${subscription_id_management}
134-
management_use_avm: false

‎docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-multi-region.yaml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ management_settings_es:
3535
azurerm_network_ddos_protection_plan:
3636
ddos:
3737
${starter_location_01}:
38-
name: ddos-${starter_location_01}
38+
name: ddos-hub-${starter_location_01}
3939
azurerm_resource_group:
4040
ddos:
4141
${starter_location_01}:
42-
name: rg-ddos-${starter_location_01}
42+
name: ${connectivity_resource_group_ddos}
4343
dns:
4444
${starter_location_01}:
45-
name: rg-dns-${starter_location_01}
45+
name: ${connectivity_resource_group_dns}
4646
settings:
4747
ddos_protection_plan:
4848
config:
@@ -76,15 +76,14 @@ management_settings_es:
7676
subscription_id_connectivity: ${subscription_id_connectivity}
7777
subscription_id_identity: ${subscription_id_identity}
7878
subscription_id_management: ${subscription_id_management}
79-
management_use_avm: false
8079
virtual_wan_settings:
8180
ddos_protection_plan:
8281
location: ${starter_location_01}
8382
name: ddos-hub-${starter_location_01}
84-
resource_group_name: rg-hub-ddos-${starter_location_01}
83+
resource_group_name: ${connectivity_resource_group_ddos}
8584
location: ${starter_location_01}
8685
name: vwan-hub-${starter_location_01}
87-
resource_group_name: rg-vwan-${starter_location_01}
86+
resource_group_name: ${connectivity_resource_group_vwan}
8887
virtual_wan_virtual_hubs:
8988
primary:
9089
firewall:
@@ -98,21 +97,21 @@ virtual_wan_virtual_hubs:
9897
address_prefix: 10.0.0.0/16
9998
location: ${starter_location_01}
10099
name: vwan-hub-${starter_location_01}
101-
resource_group_name: rg-vwan-hub-${starter_location_01}
100+
resource_group_name: ${connectivity_resource_group_vnet_primary}
102101
private_dns_zones:
103102
is_primary: true
104103
networking:
105104
private_dns_resolver:
106105
name: pdr-hub-dns-${starter_location_01}
107-
resource_group_name: rg-vwan-hub-${starter_location_01}
106+
resource_group_name: ${connectivity_resource_group_vnet_primary}
108107
virtual_network:
109108
address_space: 10.10.0.0/24
110109
name: vnet-hub-dns-${starter_location_01}
111110
private_dns_resolver_subnet:
112111
address_prefix: 10.10.0.0/28
113112
name: subnet-hub-dns-${starter_location_01}
114-
resource_group_name: rg-vwan-hub-${starter_location_01}
115-
resource_group_name: rg-hub-dns-${starter_location_01}
113+
resource_group_name: ${connectivity_resource_group_vnet_primary}
114+
resource_group_name: ${connectivity_resource_group_dns}
116115
secondary:
117116
firewall:
118117
firewall_policy:
@@ -125,18 +124,18 @@ virtual_wan_virtual_hubs:
125124
address_prefix: 10.1.0.0/16
126125
location: ${starter_location_02}
127126
name: vwan-hub-${starter_location_02}
128-
resource_group_name: rg-vwan-hub-${starter_location_02}
127+
resource_group_name: ${connectivity_resource_group_vnet_secondary}
129128
private_dns_zones:
130129
is_primary: false
131130
networking:
132131
private_dns_resolver:
133132
name: pdr-hub-dns-${starter_location_02}
134-
resource_group_name: rg-vwan-hub-${starter_location_02}
133+
resource_group_name: ${connectivity_resource_group_vnet_secondary}
135134
virtual_network:
136135
address_space: 10.11.0.0/24
137136
name: vnet-hub-dns-${starter_location_02}
138137
private_dns_resolver_subnet:
139138
address_prefix: 10.11.0.0/28
140139
name: subnet-hub-dns-${starter_location_02}
141-
resource_group_name: rg-vwan-hub-${starter_location_02}
142-
resource_group_name: rg-hub-dns-${starter_location_01}
140+
resource_group_name: ${connectivity_resource_group_vnet_secondary}
141+
resource_group_name: ${connectivity_resource_group_dns}

‎docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-single-region.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ management_settings_es:
3232
azurerm_network_ddos_protection_plan:
3333
ddos:
3434
${starter_location_01}:
35-
name: ddos-${starter_location_01}
35+
name: ddos-hub-${starter_location_01}
3636
azurerm_resource_group:
3737
ddos:
3838
${starter_location_01}:
39-
name: rg-ddos-${starter_location_01}
39+
name: ${connectivity_resource_group_ddos}
4040
dns:
4141
${starter_location_01}:
42-
name: rg-dns-${starter_location_01}
42+
name: ${connectivity_resource_group_dns}
4343
settings:
4444
ddos_protection_plan:
4545
config:
@@ -73,15 +73,14 @@ management_settings_es:
7373
subscription_id_connectivity: ${subscription_id_connectivity}
7474
subscription_id_identity: ${subscription_id_identity}
7575
subscription_id_management: ${subscription_id_management}
76-
management_use_avm: false
7776
virtual_wan_settings:
7877
ddos_protection_plan:
7978
location: ${starter_location_01}
8079
name: ddos-hub-${starter_location_01}
81-
resource_group_name: rg-hub-ddos-${starter_location_01}
80+
resource_group_name: ${connectivity_resource_group_ddos}
8281
location: ${starter_location_01}
8382
name: vwan-hub-${starter_location_01}
84-
resource_group_name: rg-vwan-${starter_location_01}
83+
resource_group_name: ${connectivity_resource_group_vwan}
8584
virtual_wan_virtual_hubs:
8685
primary:
8786
firewall:
@@ -95,18 +94,18 @@ virtual_wan_virtual_hubs:
9594
address_prefix: 10.0.0.0/16
9695
location: ${starter_location_01}
9796
name: vwan-hub-${starter_location_01}
98-
resource_group_name: rg-vwan-hub-${starter_location_01}
97+
resource_group_name: ${connectivity_resource_group_vnet_primary}
9998
private_dns_zones:
10099
is_primary: true
101100
networking:
102101
private_dns_resolver:
103102
name: pdr-hub-dns-${starter_location_01}
104-
resource_group_name: rg-vwan-hub-${starter_location_01}
103+
resource_group_name: ${connectivity_resource_group_vnet_primary}
105104
virtual_network:
106105
address_space: 10.10.0.0/24
107106
name: vnet-hub-dns-${starter_location_01}
108107
private_dns_resolver_subnet:
109108
address_prefix: 10.10.0.0/28
110109
name: subnet-hub-dns-${starter_location_01}
111-
resource_group_name: rg-vwan-hub-${starter_location_01}
112-
resource_group_name: rg-hub-dns-${starter_location_01}
110+
resource_group_name: ${connectivity_resource_group_vnet_primary}
111+
resource_group_name: ${connectivity_resource_group_dns}

0 commit comments

Comments
 (0)