From 1e9b9e51e67f6c10a42e6b5ca0abcd22eeff2d75 Mon Sep 17 00:00:00 2001 From: Ahmed Kamal Date: Thu, 27 Jan 2022 09:20:51 +0200 Subject: [PATCH] Support AZURE_ENVIRONMENT_NAME for Azure Gov (#688) Need to persist this env var `AZURE_ENVIRONMENT_NAME` for Azure gov to work. It helps the azure sdk select the correct endpoints. --- ENVIRONMENT.rst | 1 + postgres-appliance/scripts/configure_spilo.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ENVIRONMENT.rst b/ENVIRONMENT.rst index f19b562b..1b7bd393 100644 --- a/ENVIRONMENT.rst +++ b/ENVIRONMENT.rst @@ -120,3 +120,4 @@ For more inforamation on the Azure specific options, refer to https://github.com - **AZURE_STORAGE_SAS_TOKEN** - **WALG_AZURE_BUFFER_SIZE** - **WALG_AZURE_MAX_BUFFERS** +- **AZURE_ENVIRONMENT_NAME** diff --git a/postgres-appliance/scripts/configure_spilo.py b/postgres-appliance/scripts/configure_spilo.py index 466f7dc7..df8b002d 100755 --- a/postgres-appliance/scripts/configure_spilo.py +++ b/postgres-appliance/scripts/configure_spilo.py @@ -757,7 +757,8 @@ def write_wale_environment(placeholders, prefix, overwrite): 'WALE_S3_ENDPOINT', 'AWS_ENDPOINT', 'AWS_REGION', 'AWS_INSTANCE_PROFILE', 'WALG_S3_SSE_KMS_ID', 'WALG_S3_SSE', 'WALG_DISABLE_S3_SSE', 'AWS_S3_FORCE_PATH_STYLE'] azure_names = ['WALG_AZ_PREFIX', 'AZURE_STORAGE_ACCOUNT', 'AZURE_STORAGE_ACCESS_KEY', - 'AZURE_STORAGE_SAS_TOKEN', 'WALG_AZURE_BUFFER_SIZE', 'WALG_AZURE_MAX_BUFFERS'] + 'AZURE_STORAGE_SAS_TOKEN', 'WALG_AZURE_BUFFER_SIZE', 'WALG_AZURE_MAX_BUFFERS', + 'AZURE_ENVIRONMENT_NAME'] gs_names = ['WALE_GS_PREFIX', 'WALG_GS_PREFIX', 'GOOGLE_APPLICATION_CREDENTIALS'] swift_names = ['WALE_SWIFT_PREFIX', 'SWIFT_AUTHURL', 'SWIFT_TENANT', 'SWIFT_TENANT_ID', 'SWIFT_USER', 'SWIFT_USER_ID', 'SWIFT_USER_DOMAIN_NAME', 'SWIFT_USER_DOMAIN_ID', 'SWIFT_PASSWORD',