Skip to content

Commit

Permalink
Merge pull request #9 from qbeyond/feature/update-caf
Browse files Browse the repository at this point in the history
Upgraded to new CAF version
  • Loading branch information
QBY-MarkusMaring authored Jan 9, 2024
2 parents 9e2cd0b + 39c1566 commit 46c14c0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
11 changes: 7 additions & 4 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,16 @@ resource "azuread_group_member" "sp-assignments" {

module "governance_eslz" {
source = "Azure/caf-enterprise-scale/azurerm"
version = "3.2.0"
version = "5.0.3"

providers = {
azurerm = azurerm
azurerm.management = azurerm
azurerm.connectivity = azurerm
}

default_location = var.default_location

root_parent_id = data.azurerm_client_config.current.tenant_id
root_id = local.caf_root_id

Expand All @@ -83,7 +85,8 @@ module "governance_eslz" {

disable_telemetry = true

custom_landing_zones = local.caf_input
template_file_variables = var.template_file_variables
library_path = var.library_path
custom_landing_zones = local.caf_input
template_file_variables = var.template_file_variables
strict_subscription_association = true
library_path = var.library_path
}
7 changes: 6 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,9 @@ variable "template_file_variables" {
type = any
description = "If specified, provides the ability to define custom template variables used when reading in template files from the built-in and custom library_path."
default = {}
}
}

variable "default_location" {
type = string
description = "Must be specified, e.g `eastus`. Will set the Azure region in which region bound resources will be deployed. Please see: https://azure.microsoft.com/en-gb/global-infrastructure/geographies/"
}

0 comments on commit 46c14c0

Please sign in to comment.