Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added hub_routing_preference to connectivity advanced configuration #930

Merged
merged 2 commits into from
May 10, 2024
Merged

Added hub_routing_preference to connectivity advanced configuration #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b091cce
Added hub_routing_preference to connectivity advanced configuration
QBY-MarkusMaring Apr 23, 2024
04d707a
Merge branch 'main' into main
matt-FFFFFF May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/connectivity/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,8 +1255,9 @@ locals {
resource_group_name = local.virtual_hub_resource_group_name[location]
location = location
# Optional definition attributes
sku = coalesce(virtual_hub.config.sku, "Standard")
address_prefix = virtual_hub.config.address_prefix
sku = coalesce(virtual_hub.config.sku, "Standard")
address_prefix = virtual_hub.config.address_prefix
hub_routing_preference = try(local.custom_settings.azurerm_virtual_hub["virtual_wan"][location].hub_routing_preference, "ExpressRoute")
virtual_wan_id = length(local.existing_virtual_wan_resource_id) > 0 ? local.existing_virtual_wan_resource_id : (
length(local.virtual_wan_locations) > 0 ?
lookup(local.virtual_wan_resource_id, local.virtual_wan_locations[0], null) :
Expand Down
9 changes: 5 additions & 4 deletions resources.virtual_wan.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ resource "azurerm_virtual_hub" "virtual_wan" {
location = each.value.template.location

# Optional resource attributes
sku = each.value.template.sku
address_prefix = each.value.template.address_prefix
virtual_wan_id = each.value.template.virtual_wan_id
tags = each.value.template.tags
sku = each.value.template.sku
address_prefix = each.value.template.address_prefix
hub_routing_preference = each.value.template.hub_routing_preference
virtual_wan_id = each.value.template.virtual_wan_id
tags = each.value.template.tags

# Dynamic configuration blocks
dynamic "route" {
Expand Down