Skip to content

Commit a6f7d8e

Browse files
committed
Add support for WALG_FILE_PREFIX
1 parent 518d2f6 commit a6f7d8e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

postgres-appliance/scripts/configure_spilo.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
USE_KUBERNETES = os.environ.get('KUBERNETES_SERVICE_HOST') is not None
3535
KUBERNETES_DEFAULT_LABELS = '{"application": "spilo"}'
3636
PATRONI_DCS = ('kubernetes', 'zookeeper', 'exhibitor', 'consul', 'etcd3', 'etcd')
37-
AUTO_ENABLE_WALG_RESTORE = ('WAL_S3_BUCKET', 'WALE_S3_PREFIX', 'WALG_S3_PREFIX', 'WALG_AZ_PREFIX', 'WALG_SSH_PREFIX')
37+
AUTO_ENABLE_WALG_RESTORE = ('WAL_S3_BUCKET', 'WALE_S3_PREFIX', 'WALG_S3_PREFIX', 'WALG_AZ_PREFIX', 'WALG_SSH_PREFIX', 'WALG_FILE_PREFIX')
3838
WALG_SSH_NAMES = ['WALG_SSH_PREFIX', 'SSH_PRIVATE_KEY_PATH', 'SSH_USERNAME', 'SSH_PORT']
3939

4040

@@ -820,6 +820,7 @@ def write_wale_environment(placeholders, prefix, overwrite):
820820
'SWIFT_AUTH_VERSION', 'SWIFT_ENDPOINT_TYPE', 'SWIFT_REGION', 'SWIFT_DOMAIN_NAME', 'SWIFT_DOMAIN_ID',
821821
'SWIFT_PROJECT_NAME', 'SWIFT_PROJECT_ID', 'SWIFT_PROJECT_DOMAIN_NAME', 'SWIFT_PROJECT_DOMAIN_ID']
822822
ssh_names = WALG_SSH_NAMES
823+
file_names = ['WALG_FILE_PREFIX']
823824
walg_names = ['WALG_DELTA_MAX_STEPS', 'WALG_DELTA_ORIGIN', 'WALG_DOWNLOAD_CONCURRENCY',
824825
'WALG_UPLOAD_CONCURRENCY', 'WALG_UPLOAD_DISK_CONCURRENCY', 'WALG_DISK_RATE_LIMIT',
825826
'WALG_NETWORK_RATE_LIMIT', 'WALG_COMPRESSION_METHOD', 'USE_WALG_BACKUP',
@@ -833,7 +834,7 @@ def write_wale_environment(placeholders, prefix, overwrite):
833834
for name in ['PGVERSION', 'PGPORT', 'WALE_ENV_DIR', 'SCOPE', 'WAL_BUCKET_SCOPE_PREFIX', 'WAL_BUCKET_SCOPE_SUFFIX',
834835
'WAL_S3_BUCKET', 'WAL_GCS_BUCKET', 'WAL_GS_BUCKET', 'WAL_SWIFT_BUCKET', 'BACKUP_NUM_TO_RETAIN',
835836
'ENABLE_WAL_PATH_COMPAT'] + s3_names + swift_names + gs_names + walg_names + azure_names + \
836-
azure_auth_names + ssh_names:
837+
azure_auth_names + ssh_names + file_names:
837838
wale[name] = placeholders.get(prefix + name, '')
838839

839840
if wale.get('WAL_S3_BUCKET') or wale.get('WALE_S3_PREFIX') or wale.get('WALG_S3_PREFIX'):
@@ -920,6 +921,8 @@ def write_wale_environment(placeholders, prefix, overwrite):
920921

921922
elif wale.get("WALG_SSH_PREFIX"):
922923
write_envdir_names = ssh_names + walg_names
924+
elif wale.get("WALG_FILE_PREFIX"):
925+
write_envdir_names = file_names + walg_names
923926
else:
924927
return
925928

0 commit comments

Comments
 (0)