Skip to content

Network gateway default parameters #925

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

Merged
matt-FFFFFF merged 9 commits into from
Jun 6, 2024
Merged

Network gateway default parameters #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8837f2e
extended network_gateway variables
chrsundermann Apr 12, 2024
a380433
extended resource attributes of azurerm_virtual_network_gateway
chrsundermann Apr 12, 2024
3f6ca9f
extended variables for virtual_network_gateway
chrsundermann Apr 12, 2024
58a8a55
extended locals to support new virtual_network_gateway attributes
chrsundermann Apr 12, 2024
3035f9d
Merge branch 'Azure:main' into network-gateway-default-parameters
chrsundermann Apr 30, 2024
d3d3f1b
Merge branch 'main' into network-gateway-default-parameters
matt-FFFFFF May 15, 2024
d3eb5c2
executed terraform fmt -recursive
chrsundermann May 16, 2024
403312a
Merge branch 'main' into network-gateway-default-parameters
matt-FFFFFF Jun 4, 2024
848274e
fix: update provider to match new attributes for vnet gw
matt-FFFFFF Jun 6, 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
12 changes: 7 additions & 5 deletions modules/connectivity/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,11 +538,13 @@ locals {
resource_id = local.er_gateway_resource_id[location]
managed_by_module = local.deploy_virtual_network_gateway_express_route[location]
# Resource definition attributes
name = local.er_gateway_name[location]
resource_group_name = local.resource_group_names_by_scope_and_location["connectivity"][location]
location = location
type = "ExpressRoute"
sku = hub_network.config.virtual_network_gateway.config.gateway_sku_expressroute
name = local.er_gateway_name[location]
resource_group_name = local.resource_group_names_by_scope_and_location["connectivity"][location]
location = location
type = "ExpressRoute"
sku = hub_network.config.virtual_network_gateway.config.gateway_sku_expressroute
remote_vnet_traffic_enabled = hub_network.config.virtual_network_gateway.config.remote_vnet_traffic_enabled
virtual_wan_traffic_enabled = hub_network.config.virtual_network_gateway.config.virtual_wan_traffic_enabled
ip_configuration = try(
# To support `active_active = true` must currently specify a custom ip_configuration
local.custom_settings.azurerm_virtual_network_gateway["connectivity_expressroute"][location].ip_configuration,
Expand Down
8 changes: 5 additions & 3 deletions modules/connectivity/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ variable "settings" {
virtual_network_gateway = optional(object({
enabled = optional(bool, false)
config = optional(object({
address_prefix = optional(string, "")
gateway_sku_expressroute = optional(string, "")
gateway_sku_vpn = optional(string, "")
address_prefix = optional(string, "")
gateway_sku_expressroute = optional(string, "")
gateway_sku_vpn = optional(string, "")
remote_vnet_traffic_enabled = optional(bool, false)
virtual_wan_traffic_enabled = optional(bool, false)
advanced_vpn_settings = optional(object({
enable_bgp = optional(bool, null)
active_active = optional(bool, null)
Expand Down
2 changes: 2 additions & 0 deletions resources.connectivity.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ resource "azurerm_virtual_network_gateway" "connectivity" {
active_active = each.value.template.active_active
private_ip_address_enabled = each.value.template.private_ip_address_enabled
default_local_network_gateway_id = each.value.template.default_local_network_gateway_id
remote_vnet_traffic_enabled = each.value.template.remote_vnet_traffic_enabled
virtual_wan_traffic_enabled = each.value.template.virtual_wan_traffic_enabled
sku = each.value.template.sku
generation = each.value.template.generation
tags = each.value.template.tags
Expand Down
2 changes: 1 addition & 1 deletion terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = ">= 3.74.0"
version = ">= 3.84.0"
configuration_aliases = [
azurerm.connectivity,
azurerm.management,
Expand Down
8 changes: 5 additions & 3 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,11 @@ variable "configure_connectivity_resources" {
virtual_network_gateway = optional(object({
enabled = optional(bool, false)
config = optional(object({
address_prefix = optional(string, "")
gateway_sku_expressroute = optional(string, "")
gateway_sku_vpn = optional(string, "")
address_prefix = optional(string, "")
gateway_sku_expressroute = optional(string, "")
gateway_sku_vpn = optional(string, "")
remote_vnet_traffic_enabled = optional(bool, false)
virtual_wan_traffic_enabled = optional(bool, false)
advanced_vpn_settings = optional(object({
enable_bgp = optional(bool, null)
active_active = optional(bool, null)
Expand Down