Add support of ssl for OpenContrail API
Change-Id: Ia7a15d32011200060fb80717aea1d5feeaa01516
Related-PROD: PROD-29907
diff --git a/metadata/service/client/cluster.yml b/metadata/service/client/cluster.yml
index 91043a9..bf650bd 100644
--- a/metadata/service/client/cluster.yml
+++ b/metadata/service/client/cluster.yml
@@ -9,6 +9,7 @@
openstack_control_address: 127.0.0.1
opencontrail_admin_password: 'none'
opencontrail_admin_user: 'contrail'
+ opencontrail_api_ssl_enabled: False
opencontrail:
client:
enabled: True
@@ -26,3 +27,7 @@
engine: contrail
host: ${_param:opencontrail_control_address}
port: 8082
+ use_ssl: ${_param:opencontrail_api_ssl_enabled}
+ certfile: ${_param:opencontrail_api_certfile}
+ keyfile: ${_param:opencontrail_api_keyfile}
+ cafile: ${_param:opencontrail_api_cafile}
diff --git a/metadata/service/client/single.yml b/metadata/service/client/single.yml
index 2e14591..c1dfd35 100644
--- a/metadata/service/client/single.yml
+++ b/metadata/service/client/single.yml
@@ -8,6 +8,7 @@
opencontrail_identity_version: '2.0'
opencontrail_admin_password: 'none'
opencontrail_admin_user: 'contrail'
+ opencontrail_api_ssl_enabled: False
opencontrail:
client:
enabled: True
@@ -25,3 +26,7 @@
engine: contrail
host: ${_param:cluster_local_address}
port: 8082
+ use_ssl: ${_param:opencontrail_api_ssl_enabled}
+ certfile: ${_param:opencontrail_api_certfile}
+ keyfile: ${_param:opencontrail_api_keyfile}
+ cafile: ${_param:opencontrail_api_cafile}
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 48d048c..5b7ff7d 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -56,6 +56,11 @@
password: '${_param:opencontrail_admin_password}'
token: '${_param:keystone_service_token}'
tenant: admin
+ api:
+ use_ssl: ${_param:opencontrail_api_ssl_enabled}
+ certfile: ${_param:opencontrail_api_certfile}
+ keyfile: ${_param:opencontrail_api_keyfile}
+ cafile: ${_param:opencontrail_api_cafile}
members:
- host: ${_param:cluster_node01_address}
id: 1
@@ -189,6 +194,8 @@
password: '${_param:opencontrail_admin_password}'
token: '${_param:keystone_service_token}'
tenant: admin
+ api:
+ use_ssl: ${_param:opencontrail_api_ssl_enabled}
network:
engine: neutron
host: ${_param:cluster_vip_address}
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index 7ea5014..4c152b5 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -56,6 +56,11 @@
password: '${_param:opencontrail_admin_password}'
token: '${_param:keystone_service_token}'
tenant: admin
+ api:
+ use_ssl: ${_param:opencontrail_api_ssl_enabled}
+ certfile: ${_param:opencontrail_api_certfile}
+ keyfile: ${_param:opencontrail_api_keyfile}
+ cafile: ${_param:opencontrail_api_cafile}
members:
- host: ${_param:cluster_node01_address}
id: 1
@@ -150,6 +155,8 @@
password: '${_param:opencontrail_admin_password}'
token: '${_param:keystone_service_token}'
tenant: admin
+ api:
+ use_ssl: ${_param:opencontrail_api_ssl_enabled}
network:
engine: neutron
host: ${_param:cluster_vip_address}