summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-07-11 11:28:48 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-07-11 13:33:26 -0400
commit24e6b2832075eee40da19c0cb496e97494db7427 (patch)
tree90a406655a4108e447c003dbf6c3f72024e9508c
parent8d5093659acb2947fe1734ff2035073a091d3647 (diff)
downloadopenshift-24e6b2832075eee40da19c0cb496e97494db7427.tar.gz
openshift-24e6b2832075eee40da19c0cb496e97494db7427.tar.bz2
openshift-24e6b2832075eee40da19c0cb496e97494db7427.tar.xz
openshift-24e6b2832075eee40da19c0cb496e97494db7427.zip
Enable pullthrough by default in registry config for object storage.
-rw-r--r--inventory/byo/hosts.origin.example1
-rw-r--r--inventory/byo/hosts.ose.example1
-rw-r--r--roles/openshift_hosted/templates/registry_config.j22
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