keystone/auth: make service description configurable

This commit adds the service description as a class parameter in order to allow
users to update from a previous version if the service description is changed
(incorrectly spelled or wrong description)

Change-Id: Ia0ddf657991db1dd82ca063a944132643054d514
Closes-Bug: #1468407

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index ee97593ad8fd3780348151ef9a25ae4e3e3e2551..e3211b3599654ea122beb9fe7201f1aa7df9f360 100644 (file)
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -28,6 +28,9 @@
 # [*service_type*]
 #    Type of service. Optional. Defaults to 'metering'.
 #
+# [*service_description*]
+#    Description for keystone service. Optional. Defaults to 'Openstack Metering Service'.
+#
 # [*region*]
 #    Region for endpoint. Optional. Defaults to 'RegionOne'.
 #
@@ -102,6 +105,7 @@ class ceilometer::keystone::auth (
   $configure_user_role  = true,
   $service_name         = undef,
   $service_type         = 'metering',
+  $service_description  = 'Openstack Metering Service',
   $region               = 'RegionOne',
   $tenant               = 'services',
   $configure_endpoint   = true,
@@ -182,7 +186,7 @@ class ceilometer::keystone::auth (
     configure_user_role => $configure_user_role,
     configure_endpoint  => $configure_endpoint,
     service_type        => $service_type,
-    service_description => 'Openstack Metering Service',
+    service_description => $service_description,
     service_name        => $service_name_real,
     region              => $region,
     password            => $password,