From 1dcb9be147d41edd8a8db92f715fbf6ce0d59ea4 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 17 Dec 2018 14:11:07 +0800
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: I06c8ef5891e30df1edc491145f3bba83485f995e
Closes-Bug: #1468407
---
 manifests/keystone/auth.pp                                 | 7 ++++++-
 .../add-service_description-option-871a45f330d34314.yaml   | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/add-service_description-option-871a45f330d34314.yaml

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 1aad9ded..01fe0134 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -43,6 +43,10 @@
 #   (Optional) Name of the service.
 #   Defaults to 'aodh'.
 #
+# [*service_description*]
+#   (Optional) Description of the service.
+#   Default to 'OpenStack Alarming Service'
+#
 # [*public_url*]
 #   (0ptional) The endpoint's public url.
 #   This url should *not* contain any trailing '/'.
@@ -66,6 +70,7 @@ class aodh::keystone::auth (
   $configure_endpoint  = true,
   $configure_user      = true,
   $configure_user_role = true,
+  $service_description = 'OpenStack Alarming Service',
   $service_name        = 'aodh',
   $service_type        = 'alarming',
   $region              = 'RegionOne',
@@ -82,7 +87,7 @@ class aodh::keystone::auth (
     configure_endpoint  => $configure_endpoint,
     service_name        => $service_name,
     service_type        => $service_type,
-    service_description => 'OpenStack Alarming Service',
+    service_description => $service_description,
     region              => $region,
     auth_name           => $auth_name,
     password            => $password,
diff --git a/releasenotes/notes/add-service_description-option-871a45f330d34314.yaml b/releasenotes/notes/add-service_description-option-871a45f330d34314.yaml
new file mode 100644
index 00000000..64d63f15
--- /dev/null
+++ b/releasenotes/notes/add-service_description-option-871a45f330d34314.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds the service_description option to config description
+    of the service.