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 | |
| 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
| -rw-r--r-- | inventory/byo/hosts.origin.example | 1 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 1 | ||||
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index b32eb5c18..3f29a050e 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -318,6 +318,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_hosted_registry_storage_s3_bucket=bucket_name #openshift_hosted_registry_storage_s3_region=bucket_region #openshift_hosted_registry_storage_s3_chunksize=26214400 +#openshift_hosted_registry_storage_s3_rootdirectory=/registry #openshift_hosted_registry_pullthrough=true # Metrics deployment diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 5aaf6695a..9cc04b0fc 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -317,6 +317,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_hosted_registry_storage_s3_bucket=bucket_name #openshift_hosted_registry_storage_s3_region=bucket_region #openshift_hosted_registry_storage_s3_chunksize=26214400 +#openshift_hosted_registry_storage_s3_rootdirectory=/registry #openshift_hosted_registry_pullthrough=true # Metrics deployment 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: |