summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGan Huang <ghuang@redhat.com>2016-08-10 15:21:48 +0800
committerGan Huang <ghuang@redhat.com>2016-08-10 15:21:48 +0800
commit084e3ea9eef7ea57bed7bdb36ebc7e3fe45fb9c4 (patch)
tree663d36f91f134441bcf19e44d108c42332fde09c
parentf555b4c341ff96d3c4f6bd86919c1a47b1193b0e (diff)
downloadopenshift-084e3ea9eef7ea57bed7bdb36ebc7e3fe45fb9c4.tar.gz
openshift-084e3ea9eef7ea57bed7bdb36ebc7e3fe45fb9c4.tar.bz2
openshift-084e3ea9eef7ea57bed7bdb36ebc7e3fe45fb9c4.tar.xz
openshift-084e3ea9eef7ea57bed7bdb36ebc7e3fe45fb9c4.zip
docker-registry's middleware stanza should contain 'registry' and 'storage' by default
-rw-r--r--roles/openshift_hosted/templates/registry_config.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2
index ea5626642..5aa7d025f 100644
--- a/roles/openshift_hosted/templates/registry_config.j2
+++ b/roles/openshift_hosted/templates/registry_config.j2
@@ -58,6 +58,8 @@ auth:
openshift:
realm: openshift
middleware:
+ registry:
+ - name: openshift
repository:
- name: openshift
options:
@@ -69,4 +71,7 @@ middleware:
baseurl: {{ openshift.hosted.registry.storage.s3.cloudfront.baseurl }}
privatekey: {{ openshift.hosted.registry.storage.s3.cloudfront.privatekeyfile }}
keypairid: {{ openshift.hosted.registry.storage.s3.cloudfront.keypairid }}
+{% else %}
+ storage:
+ - name: openshift
{% endif -%}