Browse Source

Merge pull request #2138 from abutcher/registry-pullthrough

Enable pullthrough by default in registry config for object storage.
Scott Dodson 8 years ago
parent
commit
9718c2e21e

+ 1 - 0
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'

+ 1 - 0
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'

+ 2 - 0
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