From 4adb82d03ddd72191bb379f277374a0a5720bbc4 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 1 Nov 2017 12:03:58 +0000
Subject: [PATCH] Set keystone notification topics if ceilometer is enabled

This sets the keystone notification topics only if ceilometer is
enabled. This mitigates the issue of keystone sending notifications
when nobody is receiving them.

Closes-Bug: #1729293
Depends-On: I4dcce73446633c08ea37ba567610eec398094036
Change-Id: I063af5e642388acc180cb8e728481c5a36cc8ddc
---
 puppet/services/ceilometer-base.yaml                         | 2 ++
 .../ceilometer-keystone-notifications-f1e463d0ec939b22.yaml  | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 releasenotes/notes/ceilometer-keystone-notifications-f1e463d0ec939b22.yaml

diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index f654a79078..7749bfce9e 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -174,6 +174,8 @@ outputs:
           ceilometer::keystone::auth::region: {get_param: KeystoneRegion}
           ceilometer::keystone::auth::tenant: 'service'
           ceilometer::keystone::auth::configure_endpoint: {get_param: CeilometerApiEndpoint}
+          # Enable default notification queue
+          tripleo::profile::base::keystone::ceilometer_notification_topics: ["notifications"]
         mysql:
           ceilometer::db::mysql::password: {get_param: CeilometerPassword}
           ceilometer::db::mysql::user: ceilometer
diff --git a/releasenotes/notes/ceilometer-keystone-notifications-f1e463d0ec939b22.yaml b/releasenotes/notes/ceilometer-keystone-notifications-f1e463d0ec939b22.yaml
new file mode 100644
index 0000000000..c49806b2dc
--- /dev/null
+++ b/releasenotes/notes/ceilometer-keystone-notifications-f1e463d0ec939b22.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Enabling ceilometer automatically enables keystone notifications
+    through the 'notifications' topic (which was the default).