Move metering_secret to publisher section

In Icehouse, metering_secret has been moved to [publisher]:
http://git.io/11NwNw

Change-Id: I96c70781902e927c0295af78c93b400d7b4684bb
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

diff --git a/manifests/init.pp b/manifests/init.pp
index e1c7899f7b8ba47ea0c7bf53abc01a964ba579d3..c3056edb07e1a47ac2901ec23eeed6dd777bab5a 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -166,7 +166,7 @@ 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/verbose'                : value => $verbose;
     'DEFAULT/log_dir'                : value => $::ceilometer::params::log_dir;

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 08ad98ce7ec78e6b210d5fa30f74380f10b85b42..bd499180a261c6d286471e098c77adb9ef7a6c68 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -108,7 +108,7 @@ describe 'ceilometer' do
     end
 
     it 'configures required metering_secret' do
-      should contain_ceilometer_config('DEFAULT/metering_secret').with_value('metering-s3cr3t')
+      should contain_ceilometer_config('publisher/metering_secret').with_value('metering-s3cr3t')
     end
 
     context 'without the required metering_secret' do