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

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