start

malisharfer · May 6, 2024 · cab1878 · cab1878
1 parent 32a53b2
commit cab1878
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 4 deletions.
diff --git a/emails/main.tf b/emails/main.tf
@@ -85,7 +85,7 @@ resource "azurerm_key_vault_access_policy" "principal" {
 
 data "azurerm_container_registry" "container_registry" {
  name = var.acr_name
- resource_group_name = azurerm_storage_account.storage_account.resource_group_name
+ resource_group_name = var.acr_resource_group_name
 }
 
 resource "azurerm_role_assignment" "role_assignment" {

diff --git a/emails/variables.tf b/emails/variables.tf
@@ -14,6 +14,10 @@ variable REGISTRY_URL {
  type = string
 }
 
+variable acr_resource_group_name {
+ type = string
+}
+
 variable rg_name{
  type = string
  default = "rg-emails-dev"

diff --git a/main-project/main.tf b/main-project/main.tf
@@ -25,6 +25,7 @@ module emails{
  key_vault_name = module.administrator.key_vault_name
  key_vault_resource_group_name = module.administrator.key_vault_resource_group_name
  acr_name = var.acr_name
+ acr_resource_group_name = var.acr_resource_group_name
  REGISTRY_URL = var.registry_url
  depends_on = [
  module.administrator
@@ -36,6 +37,7 @@ module subscriptions {
  key_vault_name = module.administrator.key_vault_name
  key_vault_resource_group_name = module.administrator.key_vault_resource_group_name
  acr_name = var.acr_name
+ acr_resource_group_name = var.acr_resource_group_name
  REGISTRY_URL = var.registry_url
  depends_on = [
  module.emails
@@ -47,6 +49,7 @@ module storages{
  key_vault_name = module.administrator.key_vault_name
  key_vault_resource_group_name = module.administrator.key_vault_resource_group_name
  key_vault_secret_excel_name = module.administrator.secret_administrators_name
+ acr_resource_group_name = var.acr_resource_group_name
  acr_name = var.acr_name
  REGISTRY_URL = var.registry_url
  depends_on = [
@@ -58,6 +61,7 @@ module user-disable{
  source = "../user-disable/"
  key_vault_name = module.administrator.key_vault_name
  key_vault_resource_group_name = module.administrator.key_vault_resource_group_name
+ acr_resource_group_name = var.acr_resource_group_name
  acr_name = var.acr_name
  REGISTRY_URL = var.registry_url
  depends_on = [

diff --git a/main-project/variables.tf b/main-project/variables.tf
@@ -12,3 +12,7 @@ variable registry_url {
  type = string
  default = "https://containerregistryautomationdev.azurecr.io"
 }
+variable acr_resource_group_name {
+ type = string
+ default = "rg-dev"
+}
diff --git a/storages/main.tf b/storages/main.tf
@@ -140,7 +140,7 @@ resource "azurerm_key_vault_access_policy" "principal" {
 
 data "azurerm_container_registry" "container_registry" {
  name = var.acr_name
- resource_group_name = azurerm_storage_account.storage_account.resource_group_name
+ resource_group_name = var.acr_resource_group_name
 }
 
 resource "azurerm_role_assignment" "role_assignment" {

diff --git a/storages/variables.tf b/storages/variables.tf
@@ -18,6 +18,10 @@ variable REGISTRY_URL {
  type = string
 }
 
+variable acr_resource_group_name {
+ type = string
+}
+
 variable rg_name{
  type = string
  default ="rg-storages-dev"

diff --git a/subscriptions-automation/main.tf b/subscriptions-automation/main.tf
@@ -120,7 +120,7 @@ resource "azurerm_key_vault_access_policy" "principal" {
 
 data "azurerm_container_registry" "container_registry" {
  name = var.acr_name
- resource_group_name = azurerm_storage_account.storage_account.resource_group_name
+ resource_group_name = var.acr_resource_group_name
 }
 
 resource "azurerm_role_assignment" "role_assignment" {

diff --git a/subscriptions-automation/variables.tf b/subscriptions-automation/variables.tf
@@ -14,6 +14,10 @@ variable REGISTRY_URL {
  type = string
 }
 
+variable acr_resource_group_name {
+ type = string
+}
+
 variable rg_name{
  type = string
  default = "rg-manage-subscrioptions-dev"

diff --git a/user-disable/main.tf b/user-disable/main.tf
@@ -82,7 +82,7 @@ resource "azurerm_key_vault_access_policy" "principal" {
 
 data "azurerm_container_registry" "container_registry" {
  name = var.acr_name
- resource_group_name = azurerm_storage_account.storage_account.resource_group_name
+ resource_group_name = var.acr_resource_group_name
 }
 
 resource "azurerm_role_assignment" "role_assignment" {

diff --git a/user-disable/variables.tf b/user-disable/variables.tf
@@ -14,6 +14,10 @@ variable key_vault_resource_group_name {
  type = string
 }
 
+variable acr_resource_group_name {
+ type = string
+}
+
 variable rg_name {
  type = string
  default = "rg-user-disable-dev"