aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-14 00:07:05 +0000
committerGerrit Code Review <review@openstack.org>2017-11-14 00:07:05 +0000
commitb2c2755db70604a3bbbf78d0f0e4d61a518300a6 (patch)
tree90d8301afb5475f2c0d997c6ced438d02a626992
parentc0adfdfabad5927b0fb5aeaa39b369479dcfc299 (diff)
parent270fbacc1fb9aeb882244bc45073598ddfe5da08 (diff)
Merge "Set keystone notification topics if ceilometer is enabled" into stable/pike
-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 55ee967..140e39e 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 0000000..c49806b
--- /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).