From 4beb2c5fa56de7c19168c6e31781a51497884c95 Mon Sep 17 00:00:00 2001 From: Jared Holgate Date: Thu, 26 Sep 2024 12:06:39 +0100 Subject: [PATCH] Fix defaults --- .../complete_multi_region/config-hub-and-spoke-vnet.yaml | 6 +++--- templates/complete_multi_region/config-virtual-wan.yaml | 6 +++--- templates/complete_multi_region/management-groups.tf | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/complete_multi_region/config-hub-and-spoke-vnet.yaml b/templates/complete_multi_region/config-hub-and-spoke-vnet.yaml index eb071f17..e36e1b12 100644 --- a/templates/complete_multi_region/config-hub-and-spoke-vnet.yaml +++ b/templates/complete_multi_region/config-hub-and-spoke-vnet.yaml @@ -12,8 +12,8 @@ management_groups: # `caf-enterprise-scale` module, add inputs as listed on the module registry where necessary. # Base variables - root_name: es - root_id: Enterprise-Scale + root_name: alz + root_id: Azure-Landing-Zones default_location: ${starter_location_01} subscription_id_connectivity: ${subscription_id_connectivity} subscription_id_identity: ${subscription_id_identity} @@ -161,4 +161,4 @@ connectivity: is_primary: false # Only deploys regional zones # Configure root module settings -enable_telemetry: false +enable_telemetry: true diff --git a/templates/complete_multi_region/config-virtual-wan.yaml b/templates/complete_multi_region/config-virtual-wan.yaml index b263a2f7..1dfbd6cb 100644 --- a/templates/complete_multi_region/config-virtual-wan.yaml +++ b/templates/complete_multi_region/config-virtual-wan.yaml @@ -12,8 +12,8 @@ management_groups: # `caf-enterprise-scale` module, add inputs as listed on the module registry where necessary. # Base variables - root_name: es - root_id: Enterprise-Scale + root_name: alz + root_id: Azure-Landing-Zones default_location: ${starter_location_01} subscription_id_connectivity: ${subscription_id_connectivity} subscription_id_identity: ${subscription_id_identity} @@ -137,4 +137,4 @@ connectivity: is_primary: false # Only deploys regional zones # Configure root module settings -enable_telemetry: false +enable_telemetry: true diff --git a/templates/complete_multi_region/management-groups.tf b/templates/complete_multi_region/management-groups.tf index afdc6054..b9469992 100644 --- a/templates/complete_multi_region/management-groups.tf +++ b/templates/complete_multi_region/management-groups.tf @@ -35,8 +35,8 @@ module "management_groups" { policy_non_compliance_message_not_enforced_replacement = try(local.management_groups.policy_non_compliance_message_not_enforced_replacement, "should") policy_non_compliance_message_not_supported_definitions = try(local.management_groups.policy_non_compliance_message_not_supported_definitions, ["/providers/Microsoft.Authorization/policyDefinitions/1c6e92c9-99f0-4e55-9cf2-0c234dc48f99", "/providers/Microsoft.Authorization/policyDefinitions/1a5b4dca-0b6f-4cf5-907c-56316bc1bf3d", "/providers/Microsoft.Authorization/policyDefinitions/95edb821-ddaf-4404-9732-666045e056b4"]) resource_custom_timeouts = try(local.management_groups.resource_custom_timeouts, {}) - root_id = try(local.management_groups.root_id, "es") - root_name = try(local.management_groups.root_name, "Enterprise-Scale") + root_id = try(local.management_groups.root_id, "alz") + root_name = try(local.management_groups.root_name, "Azure-Landing-Zones") strict_subscription_association = try(local.management_groups.strict_subscription_association, true) subscription_id_connectivity = try(local.management_groups.subscription_id_connectivity, var.subscription_id_connectivity) subscription_id_identity = try(local.management_groups.subscription_id_identity, var.subscription_id_identity)