diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-10 10:53:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-10 10:53:47 -0400 |
| commit | 1655e306fb27be7b6d8a07587b5cdbf71cdb9bb2 (patch) | |
| tree | d1c41f1a646ffb34dba6695bd81c450c77edc922 | |
| parent | ed8fd1bfba10b4dfa6d689e0c428cd0d4bd42bca (diff) | |
| parent | 55fa3aafb3028c93fe2c5721217c3d71cf0bfe1a (diff) | |
| download | openshift-1655e306fb27be7b6d8a07587b5cdbf71cdb9bb2.tar.gz openshift-1655e306fb27be7b6d8a07587b5cdbf71cdb9bb2.tar.bz2 openshift-1655e306fb27be7b6d8a07587b5cdbf71cdb9bb2.tar.xz openshift-1655e306fb27be7b6d8a07587b5cdbf71cdb9bb2.zip | |
Merge pull request #2280 from ganhuang/bz#1356823
docker-registry's middleware stanza should contain 'registry' and 'storage' by default
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index ea5626642..71539775d 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -58,6 +58,10 @@ auth: openshift: realm: openshift middleware: +{% if openshift.common.version_gte_3_3_or_1_3 | bool %} + registry: + - name: openshift +{% endif -%} repository: - name: openshift options: @@ -69,4 +73,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 }} +{% elif openshift.common.version_gte_3_3_or_1_3 | bool %} + storage: + - name: openshift {% endif -%} |