x
/
packstack
Code Issues Proposed changes

Set Keystone endpoint version according to answer file 

Previously, we were hardcoding the keystone endpoint version in the
catalog (v2.0). Let's use the version provided in the answer file instead.

Change-Id: Ic36bab6ee0cb0105703f556d5933b16962e6bfeb
Closes-Bug: #1695933
This commit is contained in:
Javier Pena 2017-06-05 19:06:04 +02:00
parent 8407d4a8fa
commit 4a7f8d80be
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packstack/puppet/modules/packstack/manifests/keystone.pp
View File

@ -8,6 +8,10 @@ class packstack::keystone ()
$keystone_token_provider_str = downcase(hiera('CONFIG_KEYSTONE_TOKEN_FORMAT'))
$keystone_url = regsubst(regsubst(hiera('CONFIG_KEYSTONE_PUBLIC_URL'),'/v2.0',''),'/v3','')
$keystone_admin_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
$keystone_api_version = hiera('CONFIG_KEYSTONE_API_VERSION') ? {
'v2.0' => 'v2.0',
default => '',
}
$bind_host = hiera('CONFIG_IP_VERSION') ? {
'ipv6' => '::0',
@ -71,8 +75,7 @@ class packstack::keystone ()
internal_url => $keystone_url,
admin_url => $keystone_admin_url,
region => hiera('CONFIG_KEYSTONE_REGION'),
# so far enforce v2 as default endpoint
version => 'v2.0',
version => $keystone_api_version,
}
# default assignment driver is SQL