| commit | a2efd179fae072f030332b74507b251ad08f08f7 | [log] [tgz] |
|---|---|---|
| author | Sergey Matov <smatov@mirantis.com> | Wed Jul 17 10:42:03 2019 +0000 |
| committer | Gerrit Code Review <mail@domain.com> | Wed Jul 17 10:42:03 2019 +0000 |
| tree | f83d5017939700ec55864b50ac4b88b56dfd5fab | |
| parent | 8871f4f35dfbe1e83c47d86d3add8eb2a229699e [diff] | |
| parent | ef1c7bf20cf8e8d9e4c75cab3de9054151f3abf1 [diff] |
Merge "Do not use insecure connection option"
diff --git a/opencontrail/files/4.0/contrail-keystone-auth.conf b/opencontrail/files/4.0/contrail-keystone-auth.conf index cbcf836..88cb9d5 100644 --- a/opencontrail/files/4.0/contrail-keystone-auth.conf +++ b/opencontrail/files/4.0/contrail-keystone-auth.conf
@@ -10,7 +10,6 @@ admin_user={{ config.identity.user }} admin_password={{ config.identity.password }} admin_tenant_name={{ config.identity.tenant }} -insecure=True region_name={{ config.identity.get("region", "RegionOne") }} {%- if config.cache is defined %} #memcache_servers=127.0.0.1:11211
diff --git a/opencontrail/files/4.0/vnc_api_lib.ini b/opencontrail/files/4.0/vnc_api_lib.ini index 62c9066..bdf16b6 100644 --- a/opencontrail/files/4.0/vnc_api_lib.ini +++ b/opencontrail/files/4.0/vnc_api_lib.ini
@@ -25,7 +25,6 @@ {%- else %} AUTHN_URL = /v2.0/tokens {%- endif %} -insecure = true {%- endif %}