From aefad7cc2953a210f2ebd49e19e126c4462f04c8 Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sbadia@redhat.com>
Date: Wed, 24 Jun 2015 17:49:12 +0200
Subject: [PATCH] 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: I490dfdc96254967aff0acd64bf4cb2648820fe49
Closes-Bug: #1468407
---
 manifests/keystone/auth.pp | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index d808761..bbb9652 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -39,6 +39,9 @@
 # [*service_type*]
 #   Type of service. Defaults to 'management'.
 #
+# [*service_description*]
+#   Description for keystone service. Optional. Defaults to 'Tuskar Management Service'.
+#
 # [*public_protocol*]
 #   Protocol for public endpoint. Defaults to 'http'.
 #
@@ -69,20 +72,21 @@
 #
 class tuskar::keystone::auth (
   $password,
-  $auth_name          = 'tuskar',
-  $email              = 'tuskar@localhost',
-  $tenant             = 'services',
-  $configure_endpoint = true,
-  $service_type       = 'management',
-  $public_protocol    = 'http',
-  $public_address     = '127.0.0.1',
-  $admin_protocol     = 'http',
-  $admin_address      = '127.0.0.1',
-  $internal_protocol  = 'http',
-  $internal_address   = '127.0.0.1',
-  $port               = '8585',
-  $public_port        = undef,
-  $region             = 'RegionOne'
+  $auth_name           = 'tuskar',
+  $email               = 'tuskar@localhost',
+  $tenant              = 'services',
+  $configure_endpoint  = true,
+  $service_type        = 'management',
+  $service_description = 'Tuskar Management Service',
+  $public_protocol     = 'http',
+  $public_address      = '127.0.0.1',
+  $admin_protocol      = 'http',
+  $admin_address       = '127.0.0.1',
+  $internal_protocol   = 'http',
+  $internal_address    = '127.0.0.1',
+  $port                = '8585',
+  $public_port         = undef,
+  $region              = 'RegionOne'
 ) {
 
   Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'tuskar-api' |>
@@ -99,7 +103,7 @@ class tuskar::keystone::auth (
     configure_user_role => true,
     configure_endpoint  => $configure_endpoint,
     service_type        => $service_type,
-    service_description => 'Tuskar Management Service',
+    service_description => $service_description,
     region              => $region,
     password            => $password,
     email               => $email,