openstack/puppet-nova
Code Issues Proposed changes

Merge "Preparation for default endpoint names rename"

Browse Source
This commit is contained in:
Jenkins
2016-01-25 20:11:01 +00:00
committed by Gerrit Code Review
parent 68421d782b 865ac0fdcc
commit 760ae69087
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

@@ -226,14 +226,18 @@ class nova::keystone::auth(
warning('The admin_address parameter is deprecated, use admin_url instead.') warning('The admin_address parameter is deprecated, use admin_url instead.')
} }
# TODO(mmagr): change default service names according to default_catalog in next (M) cycle
if $service_name == undef { if $service_name == undef {
$real_service_name = $auth_name $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 { } else {
$real_service_name = $service_name $real_service_name = $service_name
} }
if $service_name_v3 == undef { if $service_name_v3 == undef {
$real_service_name_v3 = $auth_name_v3 $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 { } else {
$real_service_name_v3 = $service_name_v3 $real_service_name_v3 = $service_name_v3
} }