openstack
/
puppet-ceilometer
Code Issues Proposed changes

Do not define service resource when manage_service is false 

Change-Id: I24364dd2ec612f1d20bc5ff8076af34d7aaa5e9c
This commit is contained in:
Takashi Kajinami 2021-09-24 16:58:52 +09:00
parent 1dd5ddb827
commit f100a2c545
4 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/agent/notification.pp
View File

@ -129,15 +129,15 @@ class ceilometer::agent::notification (
} else {
$service_ensure = 'stopped'
}
}
service { 'ceilometer-agent-notification':
ensure => $service_ensure,
name => $::ceilometer::params::agent_notification_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'ceilometer-service'
service { 'ceilometer-agent-notification':
ensure => $service_ensure,
name => $::ceilometer::params::agent_notification_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'ceilometer-service'
}
}
if $manage_event_pipeline {

30
manifests/agent/polling.pp
View File

@ -120,14 +120,6 @@ class ceilometer::agent::polling (
$ipmi_namespace_name = ''
}
if $manage_service {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
}
$namespaces = delete([$central_namespace_name, $compute_namespace_name, $ipmi_namespace_name], '')
$namespaces_real = inline_template('<%= @namespaces.select { |x| x and x !~ /^undef/ }.compact.join "," %>')
@ -143,13 +135,21 @@ class ceilometer::agent::polling (
}
}
service { 'ceilometer-polling':
ensure => $service_ensure,
name => $::ceilometer::params::agent_polling_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'ceilometer-service',
if $manage_service {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
service { 'ceilometer-polling':
ensure => $service_ensure,
name => $::ceilometer::params::agent_polling_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'ceilometer-service',
}
}
if $manage_polling {

17
spec/classes/ceilometer_agent_notification_spec.rb
View File

@ -67,7 +67,7 @@ describe 'ceilometer::agent::notification' do
it 'configures ceilometer agent notification service' do
is_expected.to contain_service('ceilometer-agent-notification').with(
:ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
:ensure => params[:enabled] ? 'running' : 'stopped',
:name => platform_params[:agent_notification_service_name],
:enable => params[:enabled],
:hasstatus => true,
@ -78,22 +78,13 @@ describe 'ceilometer::agent::notification' do
end
end
context 'with disabled service managing' do
context 'with service unmanaged' do
before do
params.merge!({
:manage_service => false,
:enabled => false })
params.merge!({ :manage_service => false })
end
it 'configures ceilometer-agent-notification service' do
is_expected.to contain_service('ceilometer-agent-notification').with(
:ensure => nil,
:name => platform_params[:agent_notification_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'ceilometer-service'
)
is_expected.to_not contain_service('ceilometer-agent-notification')
end
end

15
spec/classes/ceilometer_agent_polling_spec.rb
View File

@ -78,14 +78,13 @@ describe 'ceilometer::agent::polling' do
it { should contain_ceilometer_config('DEFAULT/polling_namespaces').with_value('compute') }
end
context 'with disabled service managing' do
context 'with service disabled' do
before do
params.merge!( :manage_service => false,
:enabled => false )
params.merge!( :enabled => false )
end
it { should contain_service('ceilometer-polling').with(
:ensure => nil,
:ensure => 'stopped',
:name => platform_params[:agent_service_name],
:enable => false,
:hasstatus => true,
@ -94,6 +93,14 @@ describe 'ceilometer::agent::polling' do
)}
end
context 'with service unmanaged' do
before do
params.merge!( :manage_service => false )
end
it { should_not contain_service('ceilometer-polling') }
end
context 'with polling management enabled and default meters' do
before do
params.merge!( :manage_polling => true )