From 865ac0fdccff4c243e9e6d2c933d80dc1b8d3b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=A1gr?= Date: Wed, 14 Oct 2015 13:51:57 +0200 Subject: [PATCH] Preparation for default endpoint names rename 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 --- manifests/keystone/auth.pp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 85953e83d..38e73fb17 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -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 }