openstack/puppet-ceilometer
Code Issues Proposed changes

Move workers options into specific sections.

Browse Source 
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
This commit is contained in:
Liao Penghui 2016-01-13 00:34:27 +08:00 committed by Liao Penghui
parent f6e0e94acf
commit 6941231059
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agent/notification.pp
View File

@ -97,7 +97,7 @@ class ceilometer::agent::notification (
'notification/ack_on_event_error' : value => $ack_on_event_error; 'notification/ack_on_event_error' : value => $ack_on_event_error;
'notification/store_events' : value => $store_events; 'notification/store_events' : value => $store_events;
'notification/disable_non_metric_meters': value => $disable_non_metric_meters; 'notification/disable_non_metric_meters': value => $disable_non_metric_meters;
'DEFAULT/notification_workers' : value => $notification_workers; 'notification/workers' : value => $notification_workers;
} }
} }

2
manifests/api.pp
View File

@ -128,7 +128,7 @@ class ceilometer::api (
} }
ceilometer_config { ceilometer_config {
'DEFAULT/api_workers' : value => $api_workers; 'api/workers' : value => $api_workers;
'keystone_authtoken/admin_tenant_name' : value => $keystone_tenant; 'keystone_authtoken/admin_tenant_name' : value => $keystone_tenant;
'keystone_authtoken/admin_user' : value => $keystone_user; 'keystone_authtoken/admin_user' : value => $keystone_user;
'keystone_authtoken/admin_password' : value => $keystone_password, secret => true; 'keystone_authtoken/admin_password' : value => $keystone_password, secret => true;

4
manifests/collector.pp
View File

@ -45,9 +45,9 @@ class ceilometer::collector (
$package_ensure = 'present', $package_ensure = 'present',
$udp_address = '0.0.0.0', $udp_address = '0.0.0.0',
$udp_port = '4952', $udp_port = '4952',
$collector_workers = $::os_service_default,
$meter_dispatcher = 'database', $meter_dispatcher = 'database',
$event_dispatcher = 'database', $event_dispatcher = 'database',
$collector_workers = $::os_service_default,
) { ) {
include ::ceilometer::params include ::ceilometer::params
@ -63,9 +63,9 @@ class ceilometer::collector (
ceilometer_config { ceilometer_config {
'collector/udp_address': value => $udp_address; 'collector/udp_address': value => $udp_address;
'collector/udp_port': value => $udp_port; 'collector/udp_port': value => $udp_port;
'collector/workers': value => $collector_workers;
'DEFAULT/meter_dispatcher': value => join(any2array($meter_dispatcher), ','); 'DEFAULT/meter_dispatcher': value => join(any2array($meter_dispatcher), ',');
'DEFAULT/event_dispatcher': value => join(any2array($event_dispatcher), ','); 'DEFAULT/event_dispatcher': value => join(any2array($event_dispatcher), ',');
'DEFAULT/collector_workers': value => $collector_workers;
} }
Package[$::ceilometer::params::collector_package_name] -> Service['ceilometer-collector'] Package[$::ceilometer::params::collector_package_name] -> Service['ceilometer-collector']

2
spec/classes/ceilometer_agent_notification_spec.rb
View File

@ -45,7 +45,7 @@ describe 'ceilometer::agent::notification' do
end end
it 'configures notifications parameters in ceilometer.conf' do 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/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/store_events').with_value( params[:store_events] )
is_expected.to contain_ceilometer_config('notification/disable_non_metric_meters').with_value('<SERVICE DEFAULT>') is_expected.to contain_ceilometer_config('notification/disable_non_metric_meters').with_value('<SERVICE DEFAULT>')

2
spec/classes/ceilometer_api_spec.rb
View File

@ -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('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/host').with_value( params[:host] )
is_expected.to contain_ceilometer_config('api/port').with_value( params[:port] ) 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 end
[{:enabled => true}, {:enabled => false}].each do |param_hash| [{:enabled => true}, {:enabled => false}].each do |param_hash|

2
spec/classes/ceilometer_collector_spec.rb
View File

@ -53,9 +53,9 @@ describe 'ceilometer::collector' do
it 'configures ceilometer-collector server' 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_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/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/meter_dispatcher').with_value( 'database' )
is_expected.to contain_ceilometer_config('DEFAULT/event_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 end
it 'installs ceilometer-collector package' do it 'installs ceilometer-collector package' do