Fix glance exchange/topic to read notifications

One is a bad default value in ceilometer, waiting for the fix to be
merged.
The other is a bad value in Glance, fixed in Grizzly (maybe in 2012.2.3).

diff --git a/manifests/init.pp b/manifests/init.pp
index 952958bcbfdace9e9eecacb55a2cead2320489c7..064fcb0458ffbbebff680d6e88dc7b6c6b5d125e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -56,15 +56,22 @@ class ceilometer(
   Package['ceilometer-common'] -> Ceilometer_config<||>
 
   ceilometer_config {
-    'DEFAULT/metering_secret'    : value => $metering_secret;
-    'DEFAULT/rabbit_host'        : value => $rabbit_host;
-    'DEFAULT/rabbit_port'        : value => $rabbit_port;
-    'DEFAULT/rabbit_userid'      : value => $rabbit_userid;
-    'DEFAULT/rabbit_password'    : value => $rabbit_password;
-    'DEFAULT/rabbit_virtualhost' : value => $rabbit_virtualhost;
-    'DEFAULT/debug'              : value => $debug;
-    'DEFAULT/verbose'            : value => $verbose;
-    'DEFAULT/log_dir'            : value => $::ceilometer::params::log_dir;
+    'DEFAULT/metering_secret'        : value => $metering_secret;
+    'DEFAULT/rabbit_host'            : value => $rabbit_host;
+    'DEFAULT/rabbit_port'            : value => $rabbit_port;
+    'DEFAULT/rabbit_userid'          : value => $rabbit_userid;
+    'DEFAULT/rabbit_password'        : value => $rabbit_password;
+    'DEFAULT/rabbit_virtualhost'     : value => $rabbit_virtualhost;
+    'DEFAULT/debug'                  : value => $debug;
+    'DEFAULT/verbose'                : value => $verbose;
+    'DEFAULT/log_dir'                : value => $::ceilometer::params::log_dir;
+    # Fix a bad default value in ceilometer.
+    # Fixed in https: //review.openstack.org/#/c/18487/
+    'DEFAULT/glance_control_exchange': value => 'glance';
+    # Add glance-notifications topic.
+    # Fixed in glance https://github.com/openstack/glance/commit/2e0734e077ae
+    # Fix will be included in Grizzly
+    'DEFAULT/notification_topics'    : value => 'notifications,glance_notifications';
   }
 
 }