Merge "Move metering_secret to publisher section"

diff --cc manifests/init.pp
index 5488144dad7e7d9cd821f1ff058fc731e9eb7eed,c3056edb07e1a47ac2901ec23eeed6dd777bab5a..e6b0ae08ac2e52843d23c92bcc5682c79862210e
--- 1/manifests/init.pp
--- 2/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';

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