Merge pull request #28 from atea/renew

Renew
atea · Apr 17, 2024 · 3b67420 · 3b67420
2 parents 1348960 + 5e17b8e
commit 3b67420
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/Core/rbac.tf b/Core/rbac.tf
@@ -123,4 +123,10 @@ resource "azurerm_role_assignment" "Deltaker-New-Subs-Owner" {
   scope                = "/providers/Microsoft.Management/managementGroups/new-subscriptions"
   role_definition_name = "Owner"
   principal_id         = data.azuread_group.TC24-Deltakere.object_id
+}
+
+resource "azurerm_role_assignment" "Deltaker-Hub-Network-Contributor" {
+  scope                = "/providers/Microsoft.Management/managementGroups/${var.root_id}-connectivity"
+  role_definition_name = "Network Contributor"
+  principal_id         = data.azuread_group.TC24-Deltakere.object_id
 }
diff --git a/Core/vars.tfvars b/Core/vars.tfvars
@@ -1,12 +1,11 @@
 root_id   = "atealab"
 root_name = "Atea Lab - TC24"
 
-deploy_connectivity_resources = true
-connectivity_subscription_id  = "b7405f29-bda8-4f5f-b7c9-93417d664b74"
-management_subscription_id    = "c6f5d8fe-3185-45f8-ad61-12ae4709dee4"
-identity_subscription_id      = "4785f71f-f202-4115-8ac8-2ab93d43d75d"
-
+connectivity_subscription_id = "b7405f29-bda8-4f5f-b7c9-93417d664b74"
+management_subscription_id   = "c6f5d8fe-3185-45f8-ad61-12ae4709dee4"
+identity_subscription_id     = "4785f71f-f202-4115-8ac8-2ab93d43d75d"
 
+deploy_connectivity_resources       = true
 deploy_ne_hub                       = true
 connectivity_ne_resources_location  = "norwayeast"
 connectivity_ne_address_space       = ["10.255.0.0/16"]

diff --git a/LZ/Demo/main.tf b/LZ/Demo/main.tf
@@ -2,6 +2,14 @@ provider "azurerm" {
   features {}
 }
 
+provider "azurerm" {
+  alias           = "connectivity"
+  subscription_id = "b7405f29-bda8-4f5f-b7c9-93417d664b74"
+
+  features {
+
+  }
+}
 
 #Test trigger
 data "azurerm_client_config" "primary" {}
@@ -41,5 +49,22 @@ module "alz_architecture" {
   }
 }
 
+module "network" {
+  providers = {
+    azurerm.connectivity = azurerm.connectivity
+  }
+  source = "git::https://github.com/fwikestad/terraform-spoke-network"
+
+  hub_vnet_name                = "atealab-hub-norwayeast"
+  hub_vnet_resource_group_name = "atealab-connectivity-norwayeast"
 
+  environment      = "prod"
+  landingzone_name = "Demo"
 
+  vnet_address_space = ["10.1.0.0/16"]
+  subnets = {
+    snet01 = {
+      address_prefix = "10.1.0.0/24"
+    }
+  }
+}