Skip to content

Commit dc73f81

Browse files
committed
Add default access and secret key fallback for Hetzner S3
Updated the Hetzner S3 bucket creation task to use default access and secret keys if specific Hetzner keys are not provided.
1 parent f5075ca commit dc73f81

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

automation/roles/cloud_resources/tasks/hetzner.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,15 +448,15 @@
448448
amazon.aws.s3_bucket:
449449
endpoint_url: "{{ hetzner_object_storage_endpoint }}"
450450
ceph: true
451-
aws_access_key: "{{ hetzner_object_storage_access_key }}"
452-
aws_secret_key: "{{ hetzner_object_storage_secret_key }}"
451+
aws_access_key: "{{ hetzner_object_storage_access_key | default(default_access_key, true) }}"
452+
aws_secret_key: "{{ hetzner_object_storage_secret_key | default(default_secret_key, true) }}"
453453
name: "{{ hetzner_object_storage_name }}"
454454
region: "{{ hetzner_object_storage_region }}"
455455
requester_pays: false
456456
state: present
457-
register: s3_bucket_result
458-
failed_when: s3_bucket_result.failed and not "GetBucketRequestPayment" in s3_bucket_result.msg
459-
# TODO: https://github.com/ansible-collections/amazon.aws/issues/2447
457+
vars:
458+
default_access_key: "{{ pgbackrest_s3_key | default(wal_g_aws_access_key_id | default('')) }}"
459+
default_secret_key: "{{ pgbackrest_s3_key_secret | default(wal_g_aws_secret_access_key | default('')) }}"
460460
when:
461461
- (pgbackrest_install | bool or wal_g_install | bool)
462462
- hetzner_object_storage_create | bool

0 commit comments

Comments
 (0)