From c1d6bf1f7f3eab05f5d8153538ee0917c649e8ca Mon Sep 17 00:00:00 2001 From: Jon Calalang Date: Wed, 17 Jan 2024 14:08:40 -0800 Subject: [PATCH] what a dumb hard coded attribute --- .../terraform/infrastructure/activeDirectoryInstances.tf | 4 ++-- .../terraform/infrastructure/variables.auto.tfvars | 9 +++++---- .../terraform/infrastructure/variables.tf | 4 ++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/services/active-directory/terraform/infrastructure/activeDirectoryInstances.tf b/services/active-directory/terraform/infrastructure/activeDirectoryInstances.tf index 4f029313..6803ab7d 100644 --- a/services/active-directory/terraform/infrastructure/activeDirectoryInstances.tf +++ b/services/active-directory/terraform/infrastructure/activeDirectoryInstances.tf @@ -68,13 +68,13 @@ resource "azurerm_virtual_machine" "active-directory-instance" { # az vm image list -p nginxinc --all -f nginx_plus_with_nginx_app_protect_developer -s debian plan { - publisher = "nginxinc" + publisher = var.active-directory-instance-publisher product = var.active-directory-instance-offer name = var.active-directory-instance-sku } storage_image_reference { - publisher = "nginxinc" + publisher = var.active-directory-instance-publisher offer = var.active-directory-instance-offer sku = var.active-directory-instance-sku version = var.active-directory-instance-version diff --git a/services/active-directory/terraform/infrastructure/variables.auto.tfvars b/services/active-directory/terraform/infrastructure/variables.auto.tfvars index 771f457c..f10a3ff6 100644 --- a/services/active-directory/terraform/infrastructure/variables.auto.tfvars +++ b/services/active-directory/terraform/infrastructure/variables.auto.tfvars @@ -16,7 +16,8 @@ existing_subnet_resource_group = "calalang-networking-rg" # az vm image list -p MicrosoftWindowsServer --all -f WindowsServer -s 2022-datacenter-g2 -active-directory-instance-offer = "WindowsServer" -active-directory-instance-sku = "2022-datacenter-g2" -active-directory-instance-version = "20348.2227.240104" -active-directory-instance-count = 1 +active-directory-instance-offer = "WindowsServer" +active-directory-instance-publisher = "MicrosoftWindowsServer" +active-directory-instance-sku = "2022-datacenter-g2" +active-directory-instance-version = "20348.2227.240104" +active-directory-instance-count = 1 diff --git a/services/active-directory/terraform/infrastructure/variables.tf b/services/active-directory/terraform/infrastructure/variables.tf index daa6b8dc..d337d092 100644 --- a/services/active-directory/terraform/infrastructure/variables.tf +++ b/services/active-directory/terraform/infrastructure/variables.tf @@ -51,6 +51,10 @@ variable "active-directory-instance-offer" { type = string description = "Offer name for Active Directory instance resources" } +variable "active-directory-instance-publisher" { + type = string + description = "Publisher name for Active Directory instance resources" +} variable "active-directory-instance-sku" { type = string description = "SKU name for Active Directory instance resources"