diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-13 09:46:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 09:46:43 -0400 |
| commit | 9718c2e21edf8526e268a59c28c2b2fbb8826f7c (patch) | |
| tree | 9ec892000887ac61e79e16717e4725cd6073f1e0 | |
| parent | 21fcfdbbafc138ccc8e648b4134f9352df38da51 (diff) | |
| parent | 24e6b2832075eee40da19c0cb496e97494db7427 (diff) | |
| download | openshift-9718c2e21edf8526e268a59c28c2b2fbb8826f7c.tar.gz openshift-9718c2e21edf8526e268a59c28c2b2fbb8826f7c.tar.bz2 openshift-9718c2e21edf8526e268a59c28c2b2fbb8826f7c.tar.xz openshift-9718c2e21edf8526e268a59c28c2b2fbb8826f7c.zip | |
Merge pull request #2138 from abutcher/registry-pullthrough
Enable pullthrough by default in registry config for object 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, 4 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 159e9aa79..3ac70a035 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -301,6 +301,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_pullthrough=true # Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet') # os_sdn_network_plugin_name='redhat/openshift-ovs-multitenant' diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 5da6c4604..4c0737cb7 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -295,6 +295,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_pullthrough=true # Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet') # os_sdn_network_plugin_name='redhat/openshift-ovs-multitenant' diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index 88704d968..ea5626642 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -60,6 +60,8 @@ auth: middleware: repository: - name: openshift + options: + pullthrough: {{ openshift.hosted.registry.pullthrough | default(true) }} {% if openshift.hosted.registry.storage.provider == 's3' and 'cloudfront' in openshift.hosted.registry.storage.s3 %} storage: - name: cloudfront |