summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-09-09 13:16:16 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-09-09 13:16:16 -0400
commit6e555202c850902b66e30dd83b0a475e024efbc5 (patch)
tree5c80115c76b8e3ac175338e71198a8badb1c5b5f
parent52eeaed447a97a85d0266036136ac611be13bbae (diff)
downloadopenshift-6e555202c850902b66e30dd83b0a475e024efbc5.tar.gz
openshift-6e555202c850902b66e30dd83b0a475e024efbc5.tar.bz2
openshift-6e555202c850902b66e30dd83b0a475e024efbc5.tar.xz
openshift-6e555202c850902b66e30dd83b0a475e024efbc5.zip
Add option for specifying s3 registry storage root directory.
-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, 3 insertions, 1 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index b32eb5c18..3f29a050e 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -318,6 +318,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_storage_s3_rootdirectory=/registry
#openshift_hosted_registry_pullthrough=true
# Metrics deployment
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 5aaf6695a..9cc04b0fc 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -317,6 +317,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_storage_s3_rootdirectory=/registry
#openshift_hosted_registry_pullthrough=true
# Metrics deployment
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2
index b70ec500e..a640c264e 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: