summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-11-01 12:03:58 +0000
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-11-13 14:21:11 +0000
commit270fbacc1fb9aeb882244bc45073598ddfe5da08 (patch)
treec2647364c2556e5ea6c4daee83512e6ad34ed85c
parent994922a8ba996fe68d047df0e1486fa805dbea31 (diff)
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 (cherry picked from commit 4adb82d03ddd72191bb379f277374a0a5720bbc4)
-rw-r--r--puppet/services/ceilometer-base.yaml2
-rw-r--r--releasenotes/notes/ceilometer-keystone-notifications-f1e463d0ec939b22.yaml5
2 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 55ee9675..140e39e8 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 00000000..c49806b2
--- /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).