Merge "Do not enforce glance_control_exchange"

diff --cc manifests/init.pp
index b6d7088cd6dd7f3af54ecda1792e13bbf65cf4eb,3b46496fa8d90a490bef3abf632e5ce93ac02fe8..25395ef791f9170af8f02b25debf708322c3cb23
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -175,14 -175,13 +175,11 @@@ class ceilometer
    }
  
    # Once we got here, we can act as an honey badger on the rpc used.
 -
    ceilometer_config {
      'DEFAULT/rpc_backend'            : value => $rpc_backend;
 -    'DEFAULT/metering_secret'        : value => $metering_secret;
 +    'publisher/metering_secret'      : value => $metering_secret;
      'DEFAULT/debug'                  : value => $debug;
 -    'DEFAULT/log_dir'                : value => $log_dir;
      'DEFAULT/verbose'                : value => $verbose;
-     # Fix a bad default value in ceilometer.
-     # Fixed in https://review.openstack.org/#/c/18487/
-     'DEFAULT/glance_control_exchange': value => 'glance';
      'DEFAULT/notification_topics'    : value => 'notifications';
    }
  

diff --cc spec/classes/ceilometer_init_spec.rb
Simple merge