From 6e555202c850902b66e30dd83b0a475e024efbc5 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Fri, 9 Sep 2016 13:16:16 -0400 Subject: Add option for specifying s3 registry storage root directory. --- inventory/byo/hosts.origin.example | 1 + inventory/byo/hosts.ose.example | 1 + roles/openshift_hosted/templates/registry_config.j2 | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3