diff options
| author | Gan Huang <ghuang@redhat.com> | 2016-08-10 21:13:36 +0800 |
|---|---|---|
| committer | Gan Huang <ghuang@redhat.com> | 2016-08-10 21:13:36 +0800 |
| commit | 55fa3aafb3028c93fe2c5721217c3d71cf0bfe1a (patch) | |
| tree | cf30262f93f53d59fbdabafa49cb40785dfb3be6 | |
| parent | 084e3ea9eef7ea57bed7bdb36ebc7e3fe45fb9c4 (diff) | |
| download | openshift-55fa3aafb3028c93fe2c5721217c3d71cf0bfe1a.tar.gz openshift-55fa3aafb3028c93fe2c5721217c3d71cf0bfe1a.tar.bz2 openshift-55fa3aafb3028c93fe2c5721217c3d71cf0bfe1a.tar.xz openshift-55fa3aafb3028c93fe2c5721217c3d71cf0bfe1a.zip | |
Restrict the middleware stanza contains 'registry' and 'storage' at least on 3.3
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index 5aa7d025f..71539775d 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -58,8 +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: @@ -71,7 +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 }} -{% else %} +{% elif openshift.common.version_gte_3_3_or_1_3 | bool %} storage: - name: openshift {% endif -%} |