From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 5 Feb 2014 12:47:51 +0000 (+0000)
Subject: Merge "Move metering_secret to publisher section"
X-Git-Tag: 4.0.0~20
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9ad19cb58566312a72a1438c7d373db073afe9d0;p=puppet-modules%2Fpuppet-ceilometer.git

Merge "Move metering_secret to publisher section"
---

9ad19cb58566312a72a1438c7d373db073afe9d0
diff --cc manifests/init.pp
index 5488144,c3056ed..e6b0ae0
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -178,10 -166,10 +178,10 @@@ class ceilometer
  
    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;
 -    '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';