From f47c871eafed2bb862d16ee83db2a1562f1b3aea Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 12 Oct 2016 17:24:19 +0200 Subject: add regionendpoint parameter for registry s3 --- roles/openshift_hosted/templates/registry_config.j2 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'roles') diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index cfe7ac81c..2fc38a8cf 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 openshift.hosted.registry.storage.s3.regionendpoint %} + regionendpoint: {{ aws_bucket_region_endpoint }} +{% endif -%} bucket: {{ openshift.hosted.registry.storage.s3.bucket }} encrypt: false secure: true -- cgit v1.2.1 From ff70636ff0c08a119d57af6492f9267a7282781e Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 12 Oct 2016 20:37:28 +0200 Subject: adjustments in docs and j2 template --- roles/openshift_hosted/templates/registry_config.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles') 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 -- cgit v1.2.1 From a6310c37b86447270449f9f54f53e3d9e9ac5ebb Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 14 Oct 2016 22:47:22 +0200 Subject: formatting updates in template --- roles/openshift_hosted/templates/registry_config.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles') diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index b60175ccd..75d8f7fa6 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -15,7 +15,7 @@ storage: region: {{ openshift.hosted.registry.storage.s3.region }} {% if 'regionendpoint' in openshift.hosted.registry.storage.s3 %} regionendpoint: {{ openshift.hosted.registry.storage.s3.regionendpoint }} -{% endif -%} +{% endif %} bucket: {{ openshift.hosted.registry.storage.s3.bucket }} encrypt: false secure: true -- cgit v1.2.1