summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted/templates
diff options
context:
space:
mode:
authorTobias Brunner <tobias@tobru.ch>2016-10-12 20:37:28 +0200
committerTobias Brunner <tobias@tobru.ch>2016-10-12 20:37:28 +0200
commitff70636ff0c08a119d57af6492f9267a7282781e (patch)
tree18b117dc3dff7d0ba981ffba72011e1192c58ab0 /roles/openshift_hosted/templates
parentf47c871eafed2bb862d16ee83db2a1562f1b3aea (diff)
downloadopenshift-ff70636ff0c08a119d57af6492f9267a7282781e.tar.gz
openshift-ff70636ff0c08a119d57af6492f9267a7282781e.tar.bz2
openshift-ff70636ff0c08a119d57af6492f9267a7282781e.tar.xz
openshift-ff70636ff0c08a119d57af6492f9267a7282781e.zip
adjustments in docs and j2 template
Diffstat (limited to 'roles/openshift_hosted/templates')
-rw-r--r--roles/openshift_hosted/templates/registry_config.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2
index 2fc38a8cf..b60175ccd 100644
--- a/roles/openshift_hosted/templates/registry_config.j2
+++ b/roles/openshift_hosted/templates/registry_config.j2
@@ -13,8 +13,8 @@ storage:
accesskey: {{ openshift.hosted.registry.storage.s3.accesskey }}
secretkey: {{ openshift.hosted.registry.storage.s3.secretkey }}
region: {{ openshift.hosted.registry.storage.s3.region }}
-{% if openshift.hosted.registry.storage.s3.regionendpoint %}
- regionendpoint: {{ aws_bucket_region_endpoint }}
+{% 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