diff options
| author | Eric Sauer <esauer@redhat.com> | 2017-05-18 13:56:49 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-05-22 09:53:33 -0400 |
| commit | fddf5ba42e1f1edd0383b465a564cd575002dadb (patch) | |
| tree | 6db1fa59e0f765fab487fbb0c8946fdbfbdbae18 /roles | |
| parent | b61044dfa3669d79bd5e99c846ad4d10de172583 (diff) | |
| download | openshift-fddf5ba42e1f1edd0383b465a564cd575002dadb.tar.gz openshift-fddf5ba42e1f1edd0383b465a564cd575002dadb.tar.bz2 openshift-fddf5ba42e1f1edd0383b465a564cd575002dadb.tar.xz openshift-fddf5ba42e1f1edd0383b465a564cd575002dadb.zip | |
Removing requirement to pass aws credentials
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/storage/s3.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_hosted/tasks/registry/storage/s3.yml b/roles/openshift_hosted/tasks/registry/storage/s3.yml index 26f921f15..318969885 100644 --- a/roles/openshift_hosted/tasks/registry/storage/s3.yml +++ b/roles/openshift_hosted/tasks/registry/storage/s3.yml @@ -2,14 +2,10 @@ - name: Assert that S3 variables are provided for registry_config template assert: that: - - openshift.hosted.registry.storage.s3.accesskey | default(none) is not none - - openshift.hosted.registry.storage.s3.secretkey | default(none) is not none - openshift.hosted.registry.storage.s3.bucket | default(none) is not none - openshift.hosted.registry.storage.s3.region | default(none) is not none msg: | When using S3 storage, the following variables are required: - openshift_hosted_registry_storage_s3_accesskey - openshift_hosted_registry_storage_s3_secretkey openshift_hosted_registry_storage_s3_bucket openshift_hosted_registry_storage_s3_region diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index ca6a23f21..dc8a9f089 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -10,8 +10,12 @@ storage: blobdescriptor: inmemory {% if openshift_hosted_registry_storage_provider | default('') == 's3' %} s3: +{% if openshift_hosted_registry_storage_s3_accesskey is defined %} accesskey: {{ openshift_hosted_registry_storage_s3_accesskey }} +{% endif %} +{% if openshift_hosted_registry_storage_s3_secretkey is defined %} secretkey: {{ openshift_hosted_registry_storage_s3_secretkey }} +{% endif %} region: {{ openshift_hosted_registry_storage_s3_region }} {% if openshift_hosted_registry_storage_s3_regionendpoint is defined %} regionendpoint: {{ openshift_hosted_registry_storage_s3_regionendpoint }} |