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

diff --git a/manifests/keystone/auth_cfn.pp b/manifests/keystone/auth_cfn.pp
index 15d524e8..3c01527b 100644
--- a/manifests/keystone/auth_cfn.pp
+++ b/manifests/keystone/auth_cfn.pp
@@ -30,6 +30,10 @@
 #   (Optional) Whether to configure the admin role for the service user.
 #   Defaults to 'true'.
 #
+# [*service_description*]
+#   (Optional) Description of the service.
+#   Default to 'Openstack Cloudformation Service'
+#
 # [*service_name*]
 #   (Optional) Name of the service.
 #   Defaults to 'heat'.
@@ -71,6 +75,7 @@ class heat::keystone::auth_cfn (
   $email                = 'heat-cfn@localhost',
   $auth_name            = 'heat-cfn',
   $service_name         = 'heat-cfn',
+  $service_description  = 'Openstack Cloudformation Service',
   $service_type         = 'cloudformation',
   $region               = 'RegionOne',
   $tenant               = 'services',
@@ -93,7 +98,7 @@ class heat::keystone::auth_cfn (
     configure_endpoint  => $configure_endpoint,
     configure_service   => $configure_service,
     service_type        => $service_type,
-    service_description => 'Openstack Cloudformation Service',
+    service_description => $service_description,
     service_name        => $service_name,
     region              => $region,
     auth_name           => $auth_name,
diff --git a/releasenotes/notes/add-service_description-option-a96db61a59b62afd.yaml b/releasenotes/notes/add-service_description-option-a96db61a59b62afd.yaml
new file mode 100644
index 00000000..64d63f15
--- /dev/null
+++ b/releasenotes/notes/add-service_description-option-a96db61a59b62afd.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds the service_description option to config description
+    of the service.