summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-12 09:38:16 -0400
committerGitHub <noreply@github.com>2016-09-12 09:38:16 -0400
commit81eba2cadddce526ec41ec9b9157098cf15e2d18 (patch)
tree20d8cf7b41e4f8fc630d66562ab2556d32eaf7d1
parent6bf9b60c0e5be8ee9aa2f9bc76cdf5bbfac632b1 (diff)
parentf234a60a37d8ab8ccefe5109a7ff39466b3e6889 (diff)
downloadopenshift-81eba2cadddce526ec41ec9b9157098cf15e2d18.tar.gz
openshift-81eba2cadddce526ec41ec9b9157098cf15e2d18.tar.bz2
openshift-81eba2cadddce526ec41ec9b9157098cf15e2d18.tar.xz
openshift-81eba2cadddce526ec41ec9b9157098cf15e2d18.zip
Merge pull request #2432 from andrewklau/master
Add acceptschema2 and enforcequota settings for hosted registry
-rw-r--r--inventory/byo/hosts.origin.example2
-rw-r--r--inventory/byo/hosts.ose.example2
-rw-r--r--roles/openshift_hosted/templates/registry_config.j22
3 files changed, 6 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 3f29a050e..41ed237f7 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -320,6 +320,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#openshift_hosted_registry_storage_s3_chunksize=26214400
#openshift_hosted_registry_storage_s3_rootdirectory=/registry
#openshift_hosted_registry_pullthrough=true
+#openshift_hosted_registry_acceptschema2=true
+#openshift_hosted_registry_enforcequota=true
# Metrics deployment
# See: https://docs.openshift.com/enterprise/latest/install_config/cluster_metrics.html
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 9cc04b0fc..71e1ebb03 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -319,6 +319,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#openshift_hosted_registry_storage_s3_chunksize=26214400
#openshift_hosted_registry_storage_s3_rootdirectory=/registry
#openshift_hosted_registry_pullthrough=true
+#openshift_hosted_registry_acceptschema2=true
+#openshift_hosted_registry_enforcequota=true
# Metrics deployment
# See: https://docs.openshift.com/enterprise/latest/install_config/cluster_metrics.html
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2
index a640c264e..092b0fb35 100644
--- a/roles/openshift_hosted/templates/registry_config.j2
+++ b/roles/openshift_hosted/templates/registry_config.j2
@@ -66,6 +66,8 @@ middleware:
- name: openshift
options:
pullthrough: {{ openshift.hosted.registry.pullthrough | default(true) }}
+ acceptschema2: {{ openshift.hosted.registry.acceptschema2 | default(false) }}
+ enforcequota: {{ openshift.hosted.registry.enforcequota | default(false) }}
{% if openshift.hosted.registry.storage.provider == 's3' and 'cloudfront' in openshift.hosted.registry.storage.s3 %}
storage:
- name: cloudfront