contrail-webui: enable ssl auth for openstack services
Fixes:
- determine default parameter for identity protocol.
- fix documentation.
Change-Id: I07a82064178e466c017cb18c64a405e683a5493c
Related-PROD: PROD-29221 (PROD:29221)
diff --git a/metadata/service/client/cluster.yml b/metadata/service/client/cluster.yml
index 5defad9..91043a9 100644
--- a/metadata/service/client/cluster.yml
+++ b/metadata/service/client/cluster.yml
@@ -3,6 +3,7 @@
parameters:
_param:
opencontrail_version: 3.0
+ opencontrail_identity_protocol: http
opencontrail_identity_port: 35357
opencontrail_identity_version: '2.0'
openstack_control_address: 127.0.0.1
diff --git a/metadata/service/client/single.yml b/metadata/service/client/single.yml
index f531e03..2e14591 100644
--- a/metadata/service/client/single.yml
+++ b/metadata/service/client/single.yml
@@ -3,6 +3,7 @@
parameters:
_param:
opencontrail_version: 3.0
+ opencontrail_identity_protocol: http
opencontrail_identity_port: 35357
opencontrail_identity_version: '2.0'
opencontrail_admin_password: 'none'
diff --git a/metadata/service/control/analytics.yml b/metadata/service/control/analytics.yml
index 4e9024e..936e5f7 100644
--- a/metadata/service/control/analytics.yml
+++ b/metadata/service/control/analytics.yml
@@ -5,6 +5,7 @@
parameters:
_param:
opencontrail_version: 2.2
+ opencontrail_identity_protocol: http
opencontrail_identity_port: 35357
opencontrail_identity_version: '2.0'
opencontrail_admin_password: 'none'
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 5b1da1c..2450352 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -5,6 +5,7 @@
parameters:
_param:
opencontrail_version: 2.2
+ opencontrail_identity_protocol: http
opencontrail_identity_port: 35357
opencontrail_identity_version: '2.0'
opencontrail_admin_password: 'none'
@@ -191,6 +192,7 @@
identity:
engine: keystone
version: ${_param:opencontrail_identity_version}
+ 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 93155a2..3d618f2 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -5,6 +5,7 @@
parameters:
_param:
opencontrail_version: 2.2
+ opencontrail_identity_protocol: http
opencontrail_identity_port: 35357
opencontrail_identity_version: '2.0'
opencontrail_admin_password: 'none'
@@ -152,6 +153,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/single.yml b/metadata/service/control/single.yml
index ea8472a..5478d5c 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -5,6 +5,7 @@
parameters:
_param:
opencontrail_version: 2.2
+ opencontrail_identity_protocol: http
opencontrail_identity_port: 35357
opencontrail_identity_version: '2.0'
opencontrail_admin_password: 'none'
@@ -161,6 +162,7 @@
identity:
engine: keystone
version: ${_param:opencontrail_identity_version}
+ protocol: ${_param:opencontrail_identity_protocol}
host: ${_param:single_address}
port: ${_param:opencontrail_identity_port}
user: ${_param:opencontrail_admin_user}