Refactor DigitalOcean Spaces region handling

Updated region selection logic to use 'nyc3' for 'nyc1' and 'nyc2' server locations in cloud_resources, pgbackrest, and wal_g roles.

Author: vitabaks

automation/roles/cloud_resources/defaults/main.yml

@@ -62,7 +62,7 @@ azure_blob_storage_absent: false # Allow to delete Azure Blob Storage when delet
 
 digital_ocean_spaces_create: true # if 'cloud_provider=digitalocean'
 digital_ocean_spaces_name: "{{ patroni_cluster_name }}-backup" # Name of the Spaces Object Storage (S3 bucket).
-digital_ocean_spaces_region: "nyc3" # The region to create the Space in.
+digital_ocean_spaces_region: "{{ (server_location in ['nyc1', 'nyc2']) | ternary('nyc3', server_location) }}" # The region to create the Space in.
 digital_ocean_spaces_access_key: "" # (required) Spaces Object Storage ACCESS KEY
 digital_ocean_spaces_secret_key: "" # (required) Spaces Object Storage SECRET KEY
 digital_ocean_spaces_absent: false # Allow to delete Spaces Object Storage when deleting a cluster servers using the 'state=absent' variable.

automation/roles/pgbackrest/tasks/auto_conf.yml

@@ -158,9 +158,9 @@
         - { option: "repo1-s3-bucket", value: "{{ pgbackrest_s3_bucket | default(digital_ocean_spaces_name | default(patroni_cluster_name + '-backup')) }}" }
         - {
             option: "repo1-s3-endpoint",
-            value: "{{ pgbackrest_s3_endpoint | default('https://' + (digital_ocean_spaces_region | default(server_location)) + '.digitaloceanspaces.com') }}",
+            value: "{{ pgbackrest_s3_endpoint | default('https://' + (digital_ocean_spaces_region | default(default_region)) + '.digitaloceanspaces.com') }}",
           }
-        - { option: "repo1-s3-region", value: "{{ pgbackrest_s3_region | default(digital_ocean_spaces_region | default(server_location)) }}" }
+        - { option: "repo1-s3-region", value: "{{ pgbackrest_s3_region | default(digital_ocean_spaces_region | default(default_region)) }}" }
         - { option: "repo1-s3-uri-style", value: "{{ pgbackrest_s3_uri_style | default('path') }}" }
         - { option: "repo1-retention-full", value: "{{ pgbackrest_retention_full | default('4') }}" }
         - { option: "repo1-retention-archive", value: "{{ pgbackrest_retention_archive | default('4') }}" }
@@ -180,6 +180,8 @@
         - { option: "log-level-console", value: "info" }
         - { option: "recovery-option", value: "recovery_target_action=promote" }
         - { option: "pg1-path", value: "{{ postgresql_data_dir }}" }
+  vars:
+    default_region: "{{ (server_location in ['nyc1', 'nyc2']) | ternary('nyc3', server_location) }}"
   no_log: true # do not output contents to the ansible log
   when: cloud_provider | default('') | lower == 'digitalocean'
 

automation/roles/wal_g/tasks/auto_conf.yml

@@ -110,9 +110,9 @@
       - { option: "AWS_SECRET_ACCESS_KEY", value: "{{ wal_g_aws_secret_access_key | default(digital_ocean_spaces_secret_key | default(AWS_SECRET_ACCESS_KEY | default(''))) }}" }
       - {
           option: "AWS_ENDPOINT",
-          value: "{{ wal_g_s3_endpoint | default('https://' + (digital_ocean_spaces_region | default(server_location)) + '.digitaloceanspaces.com') }}",
+          value: "{{ wal_g_s3_endpoint | default('https://' + (digital_ocean_spaces_region | default(default_region)) + '.digitaloceanspaces.com') }}",
         }
-      - { option: "AWS_REGION", value: "{{ wal_g_s3_region | default(digital_ocean_spaces_region | default(server_location)) }}" }
+      - { option: "AWS_REGION", value: "{{ wal_g_s3_region | default(digital_ocean_spaces_region | default(default_region)) }}" }
       - { option: "AWS_S3_FORCE_PATH_STYLE", value: "{{ AWS_S3_FORCE_PATH_STYLE | default(true) }}" }
       - { option: "WALG_S3_PREFIX", value: "{{ wal_g_s3_prefix | default('s3://' + (digital_ocean_spaces_name | default(patroni_cluster_name + '-backup'))) }}" }
       - { option: "WALG_COMPRESSION_METHOD", value: "{{ wal_g_compression_method | default('brotli') }}" }
@@ -125,6 +125,8 @@
       - { option: "PGHOST", value: "{{ postgresql_unix_socket_dir | default('/var/run/postgresql') }}" }
       - { option: "PGPORT", value: "{{ postgresql_port | default('5432') }}" }
       - { option: "PGUSER", value: "{{ patroni_superuser_username | default('postgres') }}" }
+  vars:
+    default_region: "{{ (server_location in ['nyc1', 'nyc2']) | ternary('nyc3', server_location) }}"
   no_log: true # do not output contents to the ansible log
   when: cloud_provider | default('') | lower == 'digitalocean'