diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-12 09:38:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-12 09:38:16 -0400 |
| commit | 81eba2cadddce526ec41ec9b9157098cf15e2d18 (patch) | |
| tree | 20d8cf7b41e4f8fc630d66562ab2556d32eaf7d1 /roles | |
| parent | 6bf9b60c0e5be8ee9aa2f9bc76cdf5bbfac632b1 (diff) | |
| parent | f234a60a37d8ab8ccefe5109a7ff39466b3e6889 (diff) | |
| download | openshift-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
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
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 |