diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-09 16:49:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 16:49:02 -0400 |
| commit | 0cc86f37d49c3effdee8c47911333d76c432f1b7 (patch) | |
| tree | 0083db2ba3943deb912a8557761deabda4e81fa4 | |
| parent | 4c15d9c27286ab68251444143650eb5a2c2641a3 (diff) | |
| parent | 23bdad69dc2229888f2cb91c60821b63430bcb18 (diff) | |
| download | openshift-0cc86f37d49c3effdee8c47911333d76c432f1b7.tar.gz openshift-0cc86f37d49c3effdee8c47911333d76c432f1b7.tar.bz2 openshift-0cc86f37d49c3effdee8c47911333d76c432f1b7.tar.xz openshift-0cc86f37d49c3effdee8c47911333d76c432f1b7.zip | |
Merge pull request #5368 from jianlinliu/bz1490738
Update registry_config.j2 to fix BZ#1490738
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 4 |
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 eae8b328e..222b63b8a 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -53,7 +53,7 @@ storage: {% if openshift_hosted_registry_storage_swift_domain is defined %} domain: {{ openshift_hosted_registry_storage_swift_domain }} {% endif -%} -{% if openshift_hosted_registry_storage_swift_domainid %} +{% if openshift_hosted_registry_storage_swift_domainid is defined %} domainid: {{ openshift_hosted_registry_storage_swift_domainid }} {% endif -%} {% elif openshift_hosted_registry_storage_provider | default('') == 'gcs' %} @@ -63,7 +63,7 @@ storage: keyfile: /etc/registry/gcs.json {% endif -%} {% if openshift_hosted_registry_storage_gcs_rootdirectory is defined %} - rootdirectory: {{ openshift_hosted_registry_storage_gcs_rootdirectory }} + rootdirectory: {{ openshift_hosted_registry_storage_gcs_rootdirectory | default('/registry') }} {% endif -%} {% endif -%} auth: |