Enable ssl for contrail deployments
Change-Id: I844880d00449b50bf85a30647b3fdc69fc93ba76
Closes-bug: PROD-29221 (PROD:29221)
diff --git a/metadata/service/client/cluster.yml b/metadata/service/client/cluster.yml
index 337e9d0..5defad9 100644
--- a/metadata/service/client/cluster.yml
+++ b/metadata/service/client/cluster.yml
@@ -14,6 +14,7 @@
version: ${_param:opencontrail_version}
identity:
engine: keystone
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:openstack_control_address}
port: ${_param:opencontrail_identity_port}
version: ${_param:opencontrail_identity_version}
diff --git a/metadata/service/client/single.yml b/metadata/service/client/single.yml
index 8d3a509..f531e03 100644
--- a/metadata/service/client/single.yml
+++ b/metadata/service/client/single.yml
@@ -13,6 +13,7 @@
version: ${_param:opencontrail_version}
identity:
engine: keystone
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:cluster_local_address}
port: ${_param:opencontrail_identity_port}
version: ${_param:opencontrail_identity_version}
diff --git a/metadata/service/control/analytics.yml b/metadata/service/control/analytics.yml
index be71d6d..4e9024e 100644
--- a/metadata/service/control/analytics.yml
+++ b/metadata/service/control/analytics.yml
@@ -17,6 +17,7 @@
version: ${_param:opencontrail_version}
identity:
engine: keystone
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
token: '${_param:keystone_service_token}'
@@ -54,6 +55,7 @@
engine: keystone
version: ${_param:opencontrail_identity_version}
region: ${_param:openstack_region}
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
user: ${_param:opencontrail_admin_user}
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 8b9eaf7..5b1da1c 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -17,6 +17,7 @@
version: ${_param:opencontrail_version}
identity:
engine: keystone
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
token: '${_param:keystone_service_token}'
@@ -57,6 +58,7 @@
engine: keystone
version: ${_param:opencontrail_identity_version}
region: ${_param:openstack_region}
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
user: ${_param:opencontrail_admin_user}
@@ -123,6 +125,7 @@
engine: keystone
version: ${_param:opencontrail_identity_version}
region: RegionOne
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
user: ${_param:opencontrail_admin_user}
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index 728e53a..93155a2 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -17,6 +17,7 @@
version: ${_param:opencontrail_version}
identity:
engine: keystone
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
token: '${_param:keystone_service_token}'
@@ -57,6 +58,7 @@
engine: keystone
version: ${_param:opencontrail_identity_version}
region: ${_param:openstack_region}
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:cluster_vip_address}
port: ${_param:opencontrail_identity_port}
user: ${_param:opencontrail_admin_user}
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 73ce29b..ea8472a 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -17,6 +17,7 @@
version: ${_param:opencontrail_version}
identity:
engine: keystone
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:single_address}
port: ${_param:opencontrail_identity_port}
token: '${_param:keystone_service_token}'
@@ -57,6 +58,7 @@
engine: keystone
version: ${_param:opencontrail_identity_version}
region: ${_param:openstack_region}
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:single_address}
port: ${_param:opencontrail_identity_port}
user: ${_param:opencontrail_admin_user}
@@ -103,6 +105,7 @@
engine: keystone
version: ${_param:opencontrail_identity_version}
region: RegionOne
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:single_address}
port: ${_param:opencontrail_identity_port}
user: ${_param:opencontrail_admin_user}