Do not define service resource when manage_service is false
Change-Id: I24364dd2ec612f1d20bc5ff8076af34d7aaa5e9c
This commit is contained in:
parent
1dd5ddb827
commit
f100a2c545
|
@ -129,15 +129,15 @@ class ceilometer::agent::notification (
|
||||||
} else {
|
} else {
|
||||||
$service_ensure = 'stopped'
|
$service_ensure = 'stopped'
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
service { 'ceilometer-agent-notification':
|
service { 'ceilometer-agent-notification':
|
||||||
ensure => $service_ensure,
|
ensure => $service_ensure,
|
||||||
name => $::ceilometer::params::agent_notification_service_name,
|
name => $::ceilometer::params::agent_notification_service_name,
|
||||||
enable => $enabled,
|
enable => $enabled,
|
||||||
hasstatus => true,
|
hasstatus => true,
|
||||||
hasrestart => true,
|
hasrestart => true,
|
||||||
tag => 'ceilometer-service'
|
tag => 'ceilometer-service'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if $manage_event_pipeline {
|
if $manage_event_pipeline {
|
||||||
|
|
|
@ -120,14 +120,6 @@ class ceilometer::agent::polling (
|
||||||
$ipmi_namespace_name = ''
|
$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 = delete([$central_namespace_name, $compute_namespace_name, $ipmi_namespace_name], '')
|
||||||
$namespaces_real = inline_template('<%= @namespaces.select { |x| x and x !~ /^undef/ }.compact.join "," %>')
|
$namespaces_real = inline_template('<%= @namespaces.select { |x| x and x !~ /^undef/ }.compact.join "," %>')
|
||||||
|
|
||||||
|
@ -143,13 +135,21 @@ class ceilometer::agent::polling (
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
service { 'ceilometer-polling':
|
if $manage_service {
|
||||||
ensure => $service_ensure,
|
if $enabled {
|
||||||
name => $::ceilometer::params::agent_polling_service_name,
|
$service_ensure = 'running'
|
||||||
enable => $enabled,
|
} else {
|
||||||
hasstatus => true,
|
$service_ensure = 'stopped'
|
||||||
hasrestart => true,
|
}
|
||||||
tag => 'ceilometer-service',
|
|
||||||
|
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 {
|
if $manage_polling {
|
||||||
|
|
|
@ -67,7 +67,7 @@ describe 'ceilometer::agent::notification' do
|
||||||
|
|
||||||
it 'configures ceilometer agent notification service' do
|
it 'configures ceilometer agent notification service' do
|
||||||
is_expected.to contain_service('ceilometer-agent-notification').with(
|
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],
|
:name => platform_params[:agent_notification_service_name],
|
||||||
:enable => params[:enabled],
|
:enable => params[:enabled],
|
||||||
:hasstatus => true,
|
:hasstatus => true,
|
||||||
|
@ -78,22 +78,13 @@ describe 'ceilometer::agent::notification' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with disabled service managing' do
|
context 'with service unmanaged' do
|
||||||
before do
|
before do
|
||||||
params.merge!({
|
params.merge!({ :manage_service => false })
|
||||||
:manage_service => false,
|
|
||||||
:enabled => false })
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'configures ceilometer-agent-notification service' do
|
it 'configures ceilometer-agent-notification service' do
|
||||||
is_expected.to contain_service('ceilometer-agent-notification').with(
|
is_expected.to_not contain_service('ceilometer-agent-notification')
|
||||||
:ensure => nil,
|
|
||||||
:name => platform_params[:agent_notification_service_name],
|
|
||||||
:enable => false,
|
|
||||||
:hasstatus => true,
|
|
||||||
:hasrestart => true,
|
|
||||||
:tag => 'ceilometer-service'
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -78,14 +78,13 @@ describe 'ceilometer::agent::polling' do
|
||||||
it { should contain_ceilometer_config('DEFAULT/polling_namespaces').with_value('compute') }
|
it { should contain_ceilometer_config('DEFAULT/polling_namespaces').with_value('compute') }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with disabled service managing' do
|
context 'with service disabled' do
|
||||||
before do
|
before do
|
||||||
params.merge!( :manage_service => false,
|
params.merge!( :enabled => false )
|
||||||
:enabled => false )
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it { should contain_service('ceilometer-polling').with(
|
it { should contain_service('ceilometer-polling').with(
|
||||||
:ensure => nil,
|
:ensure => 'stopped',
|
||||||
:name => platform_params[:agent_service_name],
|
:name => platform_params[:agent_service_name],
|
||||||
:enable => false,
|
:enable => false,
|
||||||
:hasstatus => true,
|
:hasstatus => true,
|
||||||
|
@ -94,6 +93,14 @@ describe 'ceilometer::agent::polling' do
|
||||||
)}
|
)}
|
||||||
end
|
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
|
context 'with polling management enabled and default meters' do
|
||||||
before do
|
before do
|
||||||
params.merge!( :manage_polling => true )
|
params.merge!( :manage_polling => true )
|
||||||
|
|
Loading…
Reference in New Issue