Change section name for AMQP qpid parameters

According to docs for liberty and kilo [1,2] should be
section 'oslo_messaging_qpid' instead of 'DEFAULT'.

[1] http://docs.openstack.org/liberty/config-reference/content/configuring-rpc.html
[2] http://docs.openstack.org/kilo/config-reference/content/configuring-rpc.html

Change-Id: I9207f2edc91cfd3e3553971e00e1510c83d0f7b9

diff --git a/manifests/init.pp b/manifests/init.pp
index 29969d76eb52ccc774599bc29cdc58b28ec5c008..2cfdf0910afefb13241b93c7c7ea0eb71c483d3e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -264,19 +264,19 @@ class ceilometer(
   if $rpc_backend == 'ceilometer.openstack.common.rpc.impl_qpid' or $rpc_backend == 'qpid' {
 
     ceilometer_config {
-      'DEFAULT/qpid_hostname'              : value => $qpid_hostname;
-      'DEFAULT/qpid_port'                  : value => $qpid_port;
-      'DEFAULT/qpid_username'              : value => $qpid_username;
-      'DEFAULT/qpid_password'              : value => $qpid_password, secret => true;
-      'DEFAULT/qpid_heartbeat'             : value => $qpid_heartbeat;
-      'DEFAULT/qpid_protocol'              : value => $qpid_protocol;
-      'DEFAULT/qpid_tcp_nodelay'           : value => $qpid_tcp_nodelay;
-      'DEFAULT/qpid_reconnect'             : value => $qpid_reconnect;
-      'DEFAULT/qpid_reconnect_timeout'     : value => $qpid_reconnect_timeout;
-      'DEFAULT/qpid_reconnect_limit'       : value => $qpid_reconnect_limit;
-      'DEFAULT/qpid_reconnect_interval_min': value => $qpid_reconnect_interval_min;
-      'DEFAULT/qpid_reconnect_interval_max': value => $qpid_reconnect_interval_max;
-      'DEFAULT/qpid_reconnect_interval'    : value => $qpid_reconnect_interval;
+      'oslo_messaging_qpid/qpid_hostname'              : value => $qpid_hostname;
+      'oslo_messaging_qpid/qpid_port'                  : value => $qpid_port;
+      'oslo_messaging_qpid/qpid_username'              : value => $qpid_username;
+      'oslo_messaging_qpid/qpid_password'              : value => $qpid_password, secret => true;
+      'oslo_messaging_qpid/qpid_heartbeat'             : value => $qpid_heartbeat;
+      'oslo_messaging_qpid/qpid_protocol'              : value => $qpid_protocol;
+      'oslo_messaging_qpid/qpid_tcp_nodelay'           : value => $qpid_tcp_nodelay;
+      'oslo_messaging_qpid/qpid_reconnect'             : value => $qpid_reconnect;
+      'oslo_messaging_qpid/qpid_reconnect_timeout'     : value => $qpid_reconnect_timeout;
+      'oslo_messaging_qpid/qpid_reconnect_limit'       : value => $qpid_reconnect_limit;
+      'oslo_messaging_qpid/qpid_reconnect_interval_min': value => $qpid_reconnect_interval_min;
+      'oslo_messaging_qpid/qpid_reconnect_interval_max': value => $qpid_reconnect_interval_max;
+      'oslo_messaging_qpid/qpid_reconnect_interval'    : value => $qpid_reconnect_interval;
     }
 
   }

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 2b183ddece70b582952a4a39c0d7a43da0d9cbf7..9482949879f85e06d7813e62e3b35dae1e9e84fc 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -262,24 +262,24 @@ describe 'ceilometer' do
 
   shared_examples_for 'qpid support' do
     context("with default parameters") do
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_reconnect').with_value(true) }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_reconnect_timeout').with_value('0') }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_reconnect_limit').with_value('0') }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_reconnect_interval_min').with_value('0') }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_reconnect_interval_max').with_value('0') }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_reconnect_interval').with_value('0') }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_heartbeat').with_value('60') }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_protocol').with_value('tcp') }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_tcp_nodelay').with_value(true) }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect').with_value(true) }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_timeout').with_value('0') }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_limit').with_value('0') }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_interval_min').with_value('0') }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_interval_max').with_value('0') }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_reconnect_interval').with_value('0') }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_heartbeat').with_value('60') }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_tcp_nodelay').with_value(true) }
     end
 
     context("with mandatory parameters set") do
       it { is_expected.to contain_ceilometer_config('DEFAULT/rpc_backend').with_value('qpid') }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_hostname').with_value( params[:qpid_hostname] ) }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_port').with_value( params[:qpid_port] ) }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_username').with_value( params[:qpid_username]) }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_password').with_value(params[:qpid_password]) }
-      it { is_expected.to contain_ceilometer_config('DEFAULT/qpid_password').with_value( params[:qpid_password] ).with_secret(true) }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_hostname').with_value( params[:qpid_hostname] ) }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_port').with_value( params[:qpid_port] ) }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_username').with_value( params[:qpid_username]) }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_password').with_value(params[:qpid_password]) }
+      it { is_expected.to contain_ceilometer_config('oslo_messaging_qpid/qpid_password').with_value( params[:qpid_password] ).with_secret(true) }
     end
 
     context("with legacy rpc_backend value") do