summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted/templates
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-10-15 05:18:41 -0400
committerGitHub <noreply@github.com>2016-10-15 05:18:41 -0400
commit9fa3c6c98420e4e340507193fd3ad80c15e5c19e (patch)
tree46e659a4b61af3ca363fb4c121ee545d68340e72 /roles/openshift_hosted/templates
parent5354df0d7f89e64f62385f225c90bdc765f1544e (diff)
parenta6310c37b86447270449f9f54f53e3d9e9ac5ebb (diff)
downloadopenshift-9fa3c6c98420e4e340507193fd3ad80c15e5c19e.tar.gz
openshift-9fa3c6c98420e4e340507193fd3ad80c15e5c19e.tar.bz2
openshift-9fa3c6c98420e4e340507193fd3ad80c15e5c19e.tar.xz
openshift-9fa3c6c98420e4e340507193fd3ad80c15e5c19e.zip
Merge pull request #2590 from vshn/feature/s3_regionendpoint
add regionendpoint parameter for registry s3
Diffstat (limited to 'roles/openshift_hosted/templates')
-rw-r--r--roles/openshift_hosted/templates/registry_config.j23
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2
index cfe7ac81c..75d8f7fa6 100644
--- a/roles/openshift_hosted/templates/registry_config.j2
+++ b/roles/openshift_hosted/templates/registry_config.j2
@@ -13,6 +13,9 @@ storage:
accesskey: {{ openshift.hosted.registry.storage.s3.accesskey }}
secretkey: {{ openshift.hosted.registry.storage.s3.secretkey }}
region: {{ openshift.hosted.registry.storage.s3.region }}
+{% if 'regionendpoint' in openshift.hosted.registry.storage.s3 %}
+ regionendpoint: {{ openshift.hosted.registry.storage.s3.regionendpoint }}
+{% endif %}
bucket: {{ openshift.hosted.registry.storage.s3.bucket }}
encrypt: false
secure: true