瀏覽代碼

Merge pull request #10404 from mcanevet/registry_insecureskipverify

Add openshift_hosted_registry_storage_swift_insecureskipverify parameter
OpenShift Merge Robot 6 年之前
父節點
當前提交
d8c6cf2580
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 1 0
      playbooks/openstack/configuration.md
  2. 4 1
      roles/openshift_hosted/templates/registry_config.j2

+ 1 - 0
playbooks/openstack/configuration.md

@@ -975,6 +975,7 @@ And the following in `inventory/group_vars/OSEv3.yml`:
 * `openshift_hosted_registry_storage_swift_tenantid`: "{{ lookup('env','OS_PROJECT_ID') }}" _# can also specify tenant_
 * `openshift_hosted_registry_storage_swift_tenantid`: "{{ lookup('env','OS_PROJECT_ID') }}" _# can also specify tenant_
 * `openshift_hosted_registry_storage_swift_domain`: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}" _# optional; can also specifiy domainid_
 * `openshift_hosted_registry_storage_swift_domain`: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}" _# optional; can also specifiy domainid_
 * `openshift_hosted_registry_storage_swift_domainid`: "{{ lookup('env','OS_USER_DOMAIN_ID') }}" _# optional; can also specifiy domain_
 * `openshift_hosted_registry_storage_swift_domainid`: "{{ lookup('env','OS_USER_DOMAIN_ID') }}" _# optional; can also specifiy domain_
+* `openshift_hosted_registry_storage_swift_insecureskipverify`: "false" # optional; true to skip TLS verification
 
 
 Note that the exact environment variable names may vary depending on the contents of
 Note that the exact environment variable names may vary depending on the contents of
 your OpenStack RC file. If you use Keystone v2, you may not need to set all of these
 your OpenStack RC file. If you use Keystone v2, you may not need to set all of these

+ 4 - 1
roles/openshift_hosted/templates/registry_config.j2

@@ -1,6 +1,6 @@
 version: 0.1
 version: 0.1
 log:
 log:
-  level: {{ openshift_hosted_registry_log_level }} 
+  level: {{ openshift_hosted_registry_log_level }}
 http:
 http:
   addr: :5000
   addr: :5000
 storage:
 storage:
@@ -56,6 +56,9 @@ storage:
 {%   if openshift_hosted_registry_storage_swift_domainid is defined %}
 {%   if openshift_hosted_registry_storage_swift_domainid is defined %}
     domainid: {{ openshift_hosted_registry_storage_swift_domainid }}
     domainid: {{ openshift_hosted_registry_storage_swift_domainid }}
 {%   endif -%}
 {%   endif -%}
+{%   if openshift_hosted_registry_storage_swift_insecureskipverify | default(false) | bool %}
+    insecureskipverify: {{ openshift_hosted_registry_storage_swift_insecureskipverify }}
+{%   endif -%}
 {% elif openshift_hosted_registry_storage_provider | default('') == 'gcs' %}
 {% elif openshift_hosted_registry_storage_provider | default('') == 'gcs' %}
   gcs:
   gcs:
     bucket: {{ openshift_hosted_registry_storage_gcs_bucket }}
     bucket: {{ openshift_hosted_registry_storage_gcs_bucket }}