openstack/puppet-ceilometer
Code Issues Proposed changes

Rename the redundant worker parameter

Browse Source 
Change-Id: I3e8924c95655e12494382130b8edeb0f47e0fb95
This commit is contained in:
Takashi Kajinami 2020-12-30 21:17:15 +09:00
parent 935666dab3
commit 15921006c5
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/agent/notification.pp
View File

@ -40,7 +40,7 @@
# (Optional) Disable or enable the collection of non-metric meters. # (Optional) Disable or enable the collection of non-metric meters.
# Default to $::os_service_default. # Default to $::os_service_default.
# #
# [*notification_workers*] # [*workers*]
# (Optional) Number of workers for notification service (integer value). # (Optional) Number of workers for notification service (integer value).
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
@ -83,12 +83,18 @@
# Defaults to ['gnocchi://'], If you are using collector # Defaults to ['gnocchi://'], If you are using collector
# override this to notifier:// instead. # override this to notifier:// instead.
# #
# DEPRECATED PARAMETERS
#
# [*notification_workers*]
# (Optional) Number of workers for notification service (integer value).
# Defaults to $::os_service_default.
#
class ceilometer::agent::notification ( class ceilometer::agent::notification (
$manage_service = true, $manage_service = true,
$enabled = true, $enabled = true,
$ack_on_event_error = $::os_service_default, $ack_on_event_error = $::os_service_default,
$disable_non_metric_meters = $::os_service_default, $disable_non_metric_meters = $::os_service_default,
$notification_workers = $::os_service_default, $workers = $::os_service_default,
$messaging_urls = $::os_service_default, $messaging_urls = $::os_service_default,
$package_ensure = 'present', $package_ensure = 'present',
$manage_event_pipeline = false, $manage_event_pipeline = false,
@ -97,11 +103,20 @@ class ceilometer::agent::notification (
$manage_pipeline = false, $manage_pipeline = false,
$pipeline_publishers = ['gnocchi://'], $pipeline_publishers = ['gnocchi://'],
$pipeline_config = undef, $pipeline_config = undef,
# DEPRECATED PARAMETERS
$notification_workers = undef,
) { ) {
include ceilometer::deps include ceilometer::deps
include ceilometer::params include ceilometer::params
if $notification_workers != undef {
warning('The notification_workers parameter is deprecated. Use the workers parameter instead')
$workers_real = $notification_workers
} else {
$workers_real = $workers
}
ensure_resource('package', [$::ceilometer::params::agent_notification_package_name], ensure_resource('package', [$::ceilometer::params::agent_notification_package_name],
{ {
ensure => $package_ensure, ensure => $package_ensure,
@ -171,7 +186,7 @@ class ceilometer::agent::notification (
ceilometer_config { ceilometer_config {
'notification/ack_on_event_error' : value => $ack_on_event_error; 'notification/ack_on_event_error' : value => $ack_on_event_error;
'notification/disable_non_metric_meters': value => $disable_non_metric_meters; 'notification/disable_non_metric_meters': value => $disable_non_metric_meters;
'notification/workers' : value => $notification_workers; 'notification/workers' : value => $workers;
'notification/messaging_urls' : value => $messaging_urls, secret => true; 'notification/messaging_urls' : value => $messaging_urls, secret => true;
} }
} }

6
releasenotes/notes/notification-workers-6a09b1f65a37ab4b.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The ``ceilometer::notification::notification_workers`` parameter has been
deprecated and will be removed in a future release. Use the ``workers``
option instead.

8
spec/classes/ceilometer_agent_notification_spec.rb
View File

@ -262,6 +262,14 @@ sinks:
it { is_expected.not_to contain_file('pipeline') } it { is_expected.not_to contain_file('pipeline') }
end end
context 'with workers' do
before do
params.merge!( :workers => 4 )
end
it { is_expected.to contain_ceilometer_config('notification/workers').with_value(4) }
end
context 'with custom ack_on_event_error' do context 'with custom ack_on_event_error' do
before do before do
params.merge!( :ack_on_event_error => true ) params.merge!( :ack_on_event_error => true )