diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-09 16:37:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 16:37:05 -0400 |
| commit | 6bf9b60c0e5be8ee9aa2f9bc76cdf5bbfac632b1 (patch) | |
| tree | f8a345715a8d9e86d9f01ebaaf51080d3348dfc5 /roles | |
| parent | a03ad9d76f1ad45448d8ae18ad9b60f7e84d527a (diff) | |
| parent | 6e555202c850902b66e30dd83b0a475e024efbc5 (diff) | |
| download | openshift-6bf9b60c0e5be8ee9aa2f9bc76cdf5bbfac632b1.tar.gz openshift-6bf9b60c0e5be8ee9aa2f9bc76cdf5bbfac632b1.tar.bz2 openshift-6bf9b60c0e5be8ee9aa2f9bc76cdf5bbfac632b1.tar.xz openshift-6bf9b60c0e5be8ee9aa2f9bc76cdf5bbfac632b1.zip | |
Merge pull request #2428 from abutcher/s3-rootdirectory
Bug 1367284 - rootdirectory configuration is hardcode when installer is using s3 as registry storage
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index b70ec500e..a640c264e 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -15,7 +15,7 @@ storage: encrypt: false secure: true v4auth: true - rootdirectory: /registry + rootdirectory: {{ openshift.hosted.registry.storage.s3.rootdirectory | default('/registry') }} chunksize: "{{ openshift.hosted.registry.storage.s3.chunksize | default(26214400) }}" {% elif openshift.hosted.registry.storage.provider == 'azure_blob' %} azure: |