Revert "Fix missing location in Prod"

This reverts commit 10b7108cf7.
This commit is contained in:
Scott Donohoo 2022-12-20 11:45:18 -06:00
Родитель 22a2a9ba41
Коммит f46eb55114
2 изменённых файлов: 10 добавлений и 6 удалений

Просмотреть файл

@ -1,16 +1,18 @@
# Copyright (c) Microsoft Corporation. All rights reserved. # Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. # Licensed under the MIT License.
# Dev environment
variables: variables:
# Global # Global
ap_vm_image: ubuntu-20.04 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. 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 postfix: mb04
location: eastus location: westus
environment: dev environment: dev
enable_aml_computecluster: true enable_aml_computecluster: true
enable_aml_secure_workspace: true
enable_monitoring: false enable_monitoring: false
# Azure DevOps # Azure DevOps
@ -28,6 +30,7 @@ variables:
storage_account: st$(namespace)$(postfix)$(environment) storage_account: st$(namespace)$(postfix)$(environment)
# For terraform reference # For terraform reference
# terraform_version: 0.14.7 - quite old - updating below
terraform_version: 1.3.6 terraform_version: 1.3.6
terraform_workingdir: infrastructure terraform_workingdir: infrastructure
terraform_st_location: $(location) terraform_st_location: $(location)

Просмотреть файл

@ -3,16 +3,18 @@
# Prod environment # Prod environment
variables: variables:
# Global # Global
ap_vm_image: ubuntu-20.04 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. 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 postfix: 001
location: eastus location: uksouth
environment: prod environment: prod
enable_aml_computecluster: true enable_aml_computecluster: true
enable_monitoring: false enable_monitoring: false
# Azure DevOps # Azure DevOps
ado_service_connection_rg: Azure-ARM-Prod ado_service_connection_rg: Azure-ARM-Prod
ado_service_connection_aml_ws: Azure-ARM-Prod ado_service_connection_aml_ws: Azure-ARM-Prod
@ -30,7 +32,6 @@ variables:
# For terraform reference # For terraform reference
terraform_version: 1.3.6 terraform_version: 1.3.6
terraform_workingdir: infrastructure terraform_workingdir: infrastructure
terraform_st_location: $(location)
terraform_st_resource_group: rg-$(namespace)-$(postfix)$(environment)-tf terraform_st_resource_group: rg-$(namespace)-$(postfix)$(environment)-tf
terraform_st_storage_account: st$(namespace)$(postfix)$(environment)tf terraform_st_storage_account: st$(namespace)$(postfix)$(environment)tf
terraform_st_container_name: default terraform_st_container_name: default