Add Queens support
Parametrize keystone endpoints for opencontrail. Now all values for
opencontrail identity are hardcoded for port 35357. This commit give
user option to overide these values in cluster level. For example
OpenStack Queens realease use only port 5000.
Change vnc_api_lib.ini file to be able to create resources in
opencontrail with both identity versions v2 and v3.
Related to: PROD-20297
Change-Id: I19e395c3e88e43e3968f28f660a02300dbf0b17e
diff --git a/metadata/service/control/analytics.yml b/metadata/service/control/analytics.yml
index fcc7ddd..3a1d78c 100644
--- a/metadata/service/control/analytics.yml
+++ b/metadata/service/control/analytics.yml
@@ -5,13 +5,15 @@
parameters:
_param:
opencontrail_version: 2.2
+ opencontrail_identity_port: 35357
+ opencontrail_identity_version: '2.0'
opencontrail:
common:
version: ${_param:opencontrail_version}
identity:
engine: keystone
host: ${_param:cluster_vip_address}
- port: 35357
+ port: ${_param:opencontrail_identity_port}
token: '${_param:keystone_service_token}'
password: '${_param:keystone_admin_password}'
network:
@@ -40,10 +42,10 @@
port: 9160
identity:
engine: keystone
- version: '2.0'
+ version: ${_param:opencontrail_identity_version}
region: RegionOne
host: ${_param:cluster_vip_address}
- port: 35357
+ port: ${_param:opencontrail_identity_port}
user: admin
password: '${_param:keystone_admin_password}'
token: '${_param:keystone_service_token}'