Merge "Set keystone notification topics if ceilometer is enabled" into stable/pike

diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 6301314..630cc78 100644 (file)
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -28,6 +28,10 @@ parameters:
     type: string
     constraints:
       - allowed_values: [ 'basic', 'cadf' ]
+  KeystoneNotificationTopics:
+    description: Keystone notification topics to enable
+    default: []
+    type: comma_delimited_list
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -296,6 +300,7 @@ outputs:
             keystone::rabbit_port: {get_param: RabbitClientPort}
             keystone::notification_driver: {get_param: NotificationDriver}
             keystone::notification_format: {get_param: KeystoneNotificationFormat}
+            tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
             keystone::roles::admin::email: {get_param: AdminEmail}
             keystone::roles::admin::password: {get_param: AdminPassword}
             keystone::endpoint::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}

diff --git a/releasenotes/notes/extra-keystone-notification-topics-8be1d37afd90b910.yaml b/releasenotes/notes/extra-keystone-notification-topics-8be1d37afd90b910.yaml
new file mode 100644 (file)
index 0000000..d39a1ae
--- /dev/null
+++ b/releasenotes/notes/extra-keystone-notification-topics-8be1d37afd90b910.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    The KeystoneNotificationTopics parameter was introduced. This takes a list
+    which will configure extra notification topics, which end up as queues in
+    the message broker. This is useful for when keystone notifications need to
+    be integrated with third party software. Note that enabling telemetry will
+    by default make keystone emit notifications to the 'notifications' topic, but
+    this parameter can enable extra topics still.