x/fuel-plugin-contrail
Code Issues Proposed changes

Switch to Keystone v3

Browse Source 
Change-Id: Iacbb1f1ad0c81829104401fadcba1095036152c1
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>
This commit is contained in:
Illia Polliul 2016-09-01 17:12:20 +03:00
parent fdb341dc62
commit 858c1e0da2
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment_scripts/puppet/modules/contrail/manifests/init.pp
View File

@ -72,7 +72,8 @@ class contrail {
$keystone_ssl = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'usage', false)
$keystone_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'protocol', 'http')
$keystone_address = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'hostname', [$mos_mgmt_vip])
$auth_url = "${keystone_protocol}://${keystone_address}:35357/v2.0"
$keystone_version = 'v3'
$auth_url = "${keystone_protocol}://${keystone_address}:35357/${keystone_version}"
$neutron_ssl = get_ssl_property($ssl_hash, {}, 'neutron', 'admin', 'usage', false)
$neutron_protocol = get_ssl_property($ssl_hash, {}, 'neutron', 'admin', 'protocol', 'http')

2
deployment_scripts/puppet/modules/contrail/templates/config.global.js.erb
View File

@ -115,7 +115,7 @@ config.identityManager.authProtocol = 'http';
* If want to use with default apiVersion(v2.0), then can specify it as
* empty array.
******************************************************************************/
config.identityManager.apiVersion = ['v2.0'];
config.identityManager.apiVersion = ['<%= scope.lookupvar('contrail::keystone_version') %>'];
config.identityManager.strictSSL = false;
config.identityManager.ca = '';

4
deployment_scripts/puppet/modules/contrail/templates/vnc_api_lib.ini.erb
View File

@ -13,4 +13,8 @@ AUTHN_TYPE = keystone
AUTHN_PROTOCOL = <%= scope.lookupvar('contrail::keystone_protocol') %>
AUTHN_SERVER = <%= scope.lookupvar('contrail::keystone_address') %>
AUTHN_PORT = 35357
<% if ( scope.lookupvar('contrail::keystone_version') == 'v3' ) %>
AUTHN_URL = /v3/auth/tokens
<% else %>
AUTHN_URL = /v2.0/tokens
<% end %>