openstack/puppet-nova
Code Issues Proposed changes

Preparation for default endpoint names rename

Browse Source 
This patch prepares for changes of default endpoint names,
so that they match default_catalog name [1]

[1] https://github.com/openstack/keystone/blob/master/etc/default_catalog.templates

Partial-bug: #1506061
Change-Id: Ie05f4ea6ed02db3d6386e2d945f806b5c6ae1566
This commit is contained in:
Martin Mágr
2015-10-14 13:51:57 +02:00
parent cb77bc295f
commit 865ac0fdcc
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/keystone/auth.pp
View File

@@ -244,14 +244,18 @@ class nova::keystone::auth(
}
}
# TODO(mmagr): change default service names according to default_catalog in next (M) cycle
if $service_name == undef {
$real_service_name = $auth_name
warning('Note that service_name parameter default value will be changed to "Compute Service" (according to Keystone default catalog) in a future release. In case you use different value, please update your manifests accordingly.')
} else {
$real_service_name = $service_name
}
if $service_name_v3 == undef {
$real_service_name_v3 = $auth_name_v3
warning('Note that service_name_v3 parameter default value will be changed to "Compute Service v3" (according to Keystone default catalog) in a future release. In case you use different value, please update your manifests accordingly.')
} else {
$real_service_name_v3 = $service_name_v3
}