Move workers options into specific sections.

The notification_workers/api_workers/collector_workers options are
deprecated and should be set in [notification]/[api]/[collector]
sections separately.

Closes-Bug: #1533276

Change-Id: If1816830affd9de71ae5ee7bc2869eee7eaf8473

diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index d4ad89a73bbcafc5a9324efba77e9951fbbf3029..ac8ccb785e0ea4802c81050a3ef5d591aa8b878b 100644 (file)
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -97,7 +97,7 @@ class ceilometer::agent::notification (
     'notification/ack_on_event_error'       : value => $ack_on_event_error;
     'notification/store_events'             : value => $store_events;
     'notification/disable_non_metric_meters': value => $disable_non_metric_meters;
-    'DEFAULT/notification_workers'          : value => $notification_workers;
+    'notification/workers'                  : value => $notification_workers;
   }
 
 }

diff --git a/manifests/api.pp b/manifests/api.pp
index 03a545e078ade283e2d4cb09f1c58a63fc269d57..847fa2e9c6a5024154508b0d90e666bc365547f7 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -128,7 +128,7 @@ class ceilometer::api (
   }
 
   ceilometer_config {
-    'DEFAULT/api_workers'                  : value => $api_workers;
+    'api/workers'                          : value => $api_workers;
     'keystone_authtoken/admin_tenant_name' : value => $keystone_tenant;
     'keystone_authtoken/admin_user'        : value => $keystone_user;
     'keystone_authtoken/admin_password'    : value => $keystone_password, secret => true;

diff --git a/manifests/collector.pp b/manifests/collector.pp
index 419307f66210598f54c3c2fd8e329e557ea2b49e..5ca39e660e105023de4c861a45a893bc4135135f 100644 (file)
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -45,9 +45,9 @@ class ceilometer::collector (
   $package_ensure    = 'present',
   $udp_address       = '0.0.0.0',
   $udp_port          = '4952',
+  $collector_workers = $::os_service_default,
   $meter_dispatcher  = 'database',
   $event_dispatcher  = 'database',
-  $collector_workers = $::os_service_default,
 ) {
 
   include ::ceilometer::params
@@ -63,9 +63,9 @@ class ceilometer::collector (
   ceilometer_config {
     'collector/udp_address':     value => $udp_address;
     'collector/udp_port':        value => $udp_port;
+    'collector/workers':         value => $collector_workers;
     'DEFAULT/meter_dispatcher':  value => join(any2array($meter_dispatcher), ',');
     'DEFAULT/event_dispatcher':  value => join(any2array($event_dispatcher), ',');
-    'DEFAULT/collector_workers': value => $collector_workers;
   }
 
   Package[$::ceilometer::params::collector_package_name] -> Service['ceilometer-collector']

diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb
index dbcde79b0efe44c2f6180a467e2741f532283b7e..1a552a0ee5f3857855aec339c565bd179d308e59 100644 (file)
--- a/spec/classes/ceilometer_agent_notification_spec.rb
+++ b/spec/classes/ceilometer_agent_notification_spec.rb
@@ -45,7 +45,7 @@ describe 'ceilometer::agent::notification' do
     end
 
     it 'configures notifications parameters in ceilometer.conf' do
-      is_expected.to contain_ceilometer_config('DEFAULT/notification_workers').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ceilometer_config('notification/workers').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ceilometer_config('notification/ack_on_event_error').with_value( params[:ack_on_event_error] )
       is_expected.to contain_ceilometer_config('notification/store_events').with_value( params[:store_events] )
       is_expected.to contain_ceilometer_config('notification/disable_non_metric_meters').with_value('<SERVICE DEFAULT>')

diff --git a/spec/classes/ceilometer_api_spec.rb b/spec/classes/ceilometer_api_spec.rb
index 2471cf257d07f5618de911f5d14b82976c81a4c7..064fd1828e76e7f0009540fb2fcd1fb7a1c3261f 100644 (file)
--- a/spec/classes/ceilometer_api_spec.rb
+++ b/spec/classes/ceilometer_api_spec.rb
@@ -46,7 +46,7 @@ describe 'ceilometer::api' do
       is_expected.to contain_ceilometer_config('keystone_authtoken/identity_uri').with_value("http://127.0.0.1:35357/")
       is_expected.to contain_ceilometer_config('api/host').with_value( params[:host] )
       is_expected.to contain_ceilometer_config('api/port').with_value( params[:port] )
-      is_expected.to contain_ceilometer_config('DEFAULT/api_workers').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ceilometer_config('api/workers').with_value('<SERVICE DEFAULT>')
     end
 
     [{:enabled => true}, {:enabled => false}].each do |param_hash|

diff --git a/spec/classes/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb
index 4c680fdfd7099b6395dc00647894ef5b6d999bca..b1752f7af6e60ec50a2bb148e9a0273769458dd1 100644 (file)
--- a/spec/classes/ceilometer_collector_spec.rb
+++ b/spec/classes/ceilometer_collector_spec.rb
@@ -53,9 +53,9 @@ describe 'ceilometer::collector' do
       it 'configures ceilometer-collector server' do
         is_expected.to contain_ceilometer_config('collector/udp_address').with_value( '0.0.0.0' )
         is_expected.to contain_ceilometer_config('collector/udp_port').with_value( '4952' )
+        is_expected.to contain_ceilometer_config('collector/workers').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_ceilometer_config('DEFAULT/meter_dispatcher').with_value( 'database' )
         is_expected.to contain_ceilometer_config('DEFAULT/event_dispatcher').with_value( 'database' )
-        is_expected.to contain_ceilometer_config('DEFAULT/collector_workers').with_value('<SERVICE DEFAULT>')
       end
 
       it 'installs ceilometer-collector package' do