From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 23 Feb 2014 04:37:07 +0000 (+0000)
Subject: Merge "Do not enforce glance_control_exchange"
X-Git-Tag: 4.0.0~15
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a86e117b1b04603b61eb9ed70fb5c3b95f3a8b20;p=puppet-modules%2Fpuppet-ceilometer.git

Merge "Do not enforce glance_control_exchange"
---

a86e117b1b04603b61eb9ed70fb5c3b95f3a8b20
diff --cc manifests/init.pp
index b6d7088,3b46496..25395ef
--- a/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';
    }