From 10128a67b95319caad39b05d5581b75d1c598765 Mon Sep 17 00:00:00 2001
From: Jon Chancellor <jchancellor@microsoft.com>
Date: Thu, 27 Jun 2024 08:50:44 -0700
Subject: [PATCH] version and output changes

---
 AVS-Landing-Zone/GreenField/Terraform/hcx_addon.tf     | 2 +-
 AVS-Landing-Zone/GreenField/Terraform/main.tf          | 4 ----
 AVS-Landing-Zone/GreenField/Terraform/network.tf       | 1 +
 AVS-Landing-Zone/GreenField/Terraform/terraform.tfvars | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/AVS-Landing-Zone/GreenField/Terraform/hcx_addon.tf b/AVS-Landing-Zone/GreenField/Terraform/hcx_addon.tf
index 734b8b75..25b2573b 100644
--- a/AVS-Landing-Zone/GreenField/Terraform/hcx_addon.tf
+++ b/AVS-Landing-Zone/GreenField/Terraform/hcx_addon.tf
@@ -53,7 +53,7 @@ resource "azapi_resource" "hcx_keys" {
 
 output "hcx_keys" {
   value = {
-    for key, value in azapi_resource.hcx_keys : key => value.output.properties.activationKey
+    for key, value in azapi_resource.hcx_keys : key => jsondecode(value.output).properties.activationKey
   }
 }
 
diff --git a/AVS-Landing-Zone/GreenField/Terraform/main.tf b/AVS-Landing-Zone/GreenField/Terraform/main.tf
index 4339f14d..52355d8a 100644
--- a/AVS-Landing-Zone/GreenField/Terraform/main.tf
+++ b/AVS-Landing-Zone/GreenField/Terraform/main.tf
@@ -21,10 +21,6 @@ provider "azurerm" {
   partner_id = "754599a0-0a6f-424a-b4c5-1b12be198ae8"
 }
 
-provider "azapi" {
-  enable_hcl_output_for_data_source = true
-}
-
 ## Optional settings to setup a terraform backend in Azure storage
 
 # terraform {
diff --git a/AVS-Landing-Zone/GreenField/Terraform/network.tf b/AVS-Landing-Zone/GreenField/Terraform/network.tf
index 55d1d287..3fa0f742 100644
--- a/AVS-Landing-Zone/GreenField/Terraform/network.tf
+++ b/AVS-Landing-Zone/GreenField/Terraform/network.tf
@@ -36,6 +36,7 @@ resource "azurerm_subnet" "jumpboxsubnet" {
 resource "azurerm_subnet_network_security_group_association" "this_jumpbox" {
   subnet_id                 = azurerm_subnet.jumpboxsubnet.id
   network_security_group_id = module.testnsg.nsg_resource.id
+  depends_on = [ azurerm_virtual_network.network, azurerm_subnet.jumpboxsubnet, module.testnsg ]
 }
 
 module "testnsg" {
diff --git a/AVS-Landing-Zone/GreenField/Terraform/terraform.tfvars b/AVS-Landing-Zone/GreenField/Terraform/terraform.tfvars
index 61222b34..22b5957b 100644
--- a/AVS-Landing-Zone/GreenField/Terraform/terraform.tfvars
+++ b/AVS-Landing-Zone/GreenField/Terraform/terraform.tfvars
@@ -3,10 +3,10 @@
 prefix = "AVS"
 
 #Region to deploy the AVS Private Cloud and associated components
-region = "eastasia"
+region = "southafricanorth"
 
 #AVS requires a /22 CIDR range, this must not overlap with other networks to be used with AVS
-avs-networkblock = "10.1.0.0/22"
+avs-networkblock = "10.0.0.0/22"
 avs-sku          = "AV36"
 avs-hostcount    = 3
 hcx_key_names    = ["hcxsite1", "hcxsite2"]