Merge pull request #116 from iriahk89/master

update tag inheritance
Azure · Dec 10, 2020 · d60741e · d60741e
2 parents dbb48d4 + e818056
commit d60741e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/landingzones/caf_launchpad/add-ons/azure_devops/locals.remote_tfstates.tf b/landingzones/caf_launchpad/add-ons/azure_devops/locals.remote_tfstates.tf
@@ -30,7 +30,7 @@ locals {
     "landingzone" = var.landingzone.key
   }
 
-  tags = merge(var.tags, local.landingzone_tag, { "level" = var.landingzone.level }, { "environment" = local.global_settings.environment }, { "rover_version" = var.rover_version })
+  tags = merge(var.tags, local.landingzone_tag, local.global_settings.tags, { "level" = var.landingzone.level }, { "environment" = local.global_settings.environment }, { "rover_version" = var.rover_version })
 
   global_settings = {
     prefix             = data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.global_settings.prefix

diff --git a/landingzones/caf_launchpad/add-ons/azure_devops_agent/locals.current_tfstates.tf b/landingzones/caf_launchpad/add-ons/azure_devops_agent/locals.current_tfstates.tf
@@ -30,7 +30,7 @@ locals {
     "landingzone" = var.landingzone.key
   }
 
-  tags = merge(var.tags, local.landingzone_tag, { "level" = var.landingzone.level }, { "environment" = local.global_settings.environment }, { "rover_version" = var.rover_version })
+  tags = merge(var.tags, local.landingzone_tag, local.global_settings.tags, { "level" = var.landingzone.level }, { "environment" = local.global_settings.environment }, { "rover_version" = var.rover_version })
 
   global_settings = data.terraform_remote_state.remote[var.landingzone.global_settings_key].outputs.global_settings