From f46eb55114a256a8422d8560a63df704d61b293d Mon Sep 17 00:00:00 2001
From: Scott Donohoo <sdonohoo@microsoft.com>
Date: Tue, 20 Dec 2022 11:45:18 -0600
Subject: [PATCH] Revert "Fix missing location in Prod"

This reverts commit 10b7108cf76ad413d3ee34294e051b3d90e24cd2.
---
 config-infra-dev.yml  | 9 ++++++---
 config-infra-prod.yml | 7 ++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config-infra-dev.yml b/config-infra-dev.yml
index 4a737ac..8eaa10f 100644
--- a/config-infra-dev.yml
+++ b/config-infra-dev.yml
@@ -1,16 +1,18 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-# Dev environment
 variables:
+
   # Global
   ap_vm_image: ubuntu-20.04
 
   namespace: mlopsv2 #Note: A namespace with many characters will cause storage account creation to fail due to storage account names having a limit of 24 characters.
-  postfix: 0001
-  location: eastus
+  postfix: mb04
+  location: westus
+
   environment: dev
   enable_aml_computecluster: true
+  enable_aml_secure_workspace: true
   enable_monitoring: false
 
   # Azure DevOps
@@ -28,6 +30,7 @@ variables:
   storage_account: st$(namespace)$(postfix)$(environment)
 
   # For terraform reference
+  # terraform_version: 0.14.7 - quite old - updating below
   terraform_version: 1.3.6
   terraform_workingdir: infrastructure
   terraform_st_location: $(location)
diff --git a/config-infra-prod.yml b/config-infra-prod.yml
index 6103566..0ce1508 100644
--- a/config-infra-prod.yml
+++ b/config-infra-prod.yml
@@ -3,16 +3,18 @@
 
 # Prod environment
 variables:
+
   # Global
   ap_vm_image: ubuntu-20.04
 
   namespace: mlopsv2 #Note: A namespace with many characters will cause storage account creation to fail due to storage account names having a limit of 24 characters.
-  postfix: 0001
-  location: eastus
+  postfix: 001
+  location: uksouth
   environment: prod
   enable_aml_computecluster: true
   enable_monitoring: false
 
+
   # Azure DevOps
   ado_service_connection_rg: Azure-ARM-Prod
   ado_service_connection_aml_ws: Azure-ARM-Prod
@@ -30,7 +32,6 @@ variables:
   # For terraform reference
   terraform_version: 1.3.6
   terraform_workingdir: infrastructure
-  terraform_st_location: $(location)
   terraform_st_resource_group: rg-$(namespace)-$(postfix)$(environment)-tf
   terraform_st_storage_account: st$(namespace)$(postfix)$(environment)tf
   terraform_st_container_name: default