소스 검색

Add option for specifying s3 registry storage root directory.

Andrew Butcher 8 년 전
부모
커밋
6e555202c8
3개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      inventory/byo/hosts.origin.example
  2. 1 0
      inventory/byo/hosts.ose.example
  3. 1 1
      roles/openshift_hosted/templates/registry_config.j2

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 1
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: