From 1d388344661b056c45e79e3c189f82db6ed0d69b Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Mon, 27 Apr 2015 17:05:39 -0700 Subject: [PATCH] make service description configurable The previous commit that changed the service description from Openstack to OpenStack actually introduced a bug that means that users cannot upgrade between those two versions of the code. An attempt to use this manifest to upgrade from earlier versions of the code before this change was made is currently not supported because keystone_service does not support updating it's description. This commit adds the service description as a class parameter so that folks using older version of the module can update it to the incorrectly spelled version. Change-Id: Id8b01c7456b067c19fcf6cc1503c22a11b7d3fd9 --- manifests/keystone/auth.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 9544b196..463ba6bf 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -57,6 +57,9 @@ # [*admin_protocol*] # Protocol for admin endpoint. Optional. Defaults to 'http'. # +# [*service_description*] +# Description for keystone service. Optional. Defaults to 'OpenStack Image Service''. +# class glance::keystone::auth( $password, $email = 'glance@localhost', @@ -74,7 +77,8 @@ class glance::keystone::auth( $tenant = 'services', $public_protocol = 'http', $admin_protocol = 'http', - $internal_protocol = 'http' + $internal_protocol = 'http', + $service_description = 'OpenStack Image Service', ) { if $service_name == undef { @@ -92,7 +96,7 @@ class glance::keystone::auth( configure_user_role => $configure_user_role, configure_endpoint => $configure_endpoint, service_type => $service_type, - service_description => 'OpenStack Image Service', + service_description => $service_description, service_name => $real_service_name, region => $region, password => $password,