summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted/templates
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_hosted/templates')
-rw-r--r--roles/openshift_hosted/templates/registry_config.j26
1 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2
index 71539775d..092b0fb35 100644
--- a/roles/openshift_hosted/templates/registry_config.j2
+++ b/roles/openshift_hosted/templates/registry_config.j2
@@ -15,7 +15,7 @@ storage:
encrypt: false
secure: true
v4auth: true
- rootdirectory: /registry
+ rootdirectory: {{ openshift.hosted.registry.storage.s3.rootdirectory | default('/registry') }}
chunksize: "{{ openshift.hosted.registry.storage.s3.chunksize | default(26214400) }}"
{% elif openshift.hosted.registry.storage.provider == 'azure_blob' %}
azure:
@@ -61,11 +61,13 @@ middleware:
{% if openshift.common.version_gte_3_3_or_1_3 | bool %}
registry:
- name: openshift
-{% endif -%}
+{% endif %}
repository:
- 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