openstack/puppet-mistral
Code Issues Proposed changes

Do not declare service resource when manage_service is false

Browse Source 
Change-Id: I4922f159985adb0e97daeb41d842d47ba8bee5fa
This commit is contained in:
Takashi Kajinami
2022-01-24 09:19:15 +09:00
parent 4b6198fae3
commit ad5de59da3
8 changed files with 67 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/api.pp
View File

@@ -92,7 +92,6 @@ class mistral::api (
} else {
$service_ensure = 'stopped'
}
}
if $service_name == $::mistral::params::api_service_name {
service { 'mistral-api':
@@ -118,6 +117,7 @@ class mistral::api (
fail("Invalid service_name. Either mistral/openstack-mistral-api for running \
as a standalone service, or httpd for being run by a httpd server")
}
}
mistral_config {
'api/api_workers' : value => $api_workers;

2
manifests/engine.pp
View File

@@ -74,7 +74,6 @@ class mistral::engine (
} else {
$service_ensure = 'stopped'
}
}
service { 'mistral-engine':
ensure => $service_ensure,
@@ -84,6 +83,7 @@ class mistral::engine (
hasrestart => true,
tag => 'mistral-service',
}
}
mistral_config {
'engine/host': value => $host;

2
manifests/event_engine.pp
View File

@@ -52,7 +52,6 @@ class mistral::event_engine (
} else {
$service_ensure = 'stopped'
}
}
service { 'mistral-event-engine':
ensure => $service_ensure,
@@ -62,6 +61,7 @@ class mistral::event_engine (
hasrestart => true,
tag => 'mistral-service',
}
}
mistral_config {
'event_engine/host': value => $host;

2
manifests/executor.pp
View File

@@ -52,7 +52,6 @@ class mistral::executor (
} else {
$service_ensure = 'stopped'
}
}
service { 'mistral-executor':
ensure => $service_ensure,
@@ -62,6 +61,7 @@ class mistral::executor (
hasrestart => true,
tag => 'mistral-service',
}
}
mistral_config {
'executor/host': value => $host;

18
spec/classes/mistral_api_spec.rb
View File

@@ -45,7 +45,7 @@ describe 'mistral::api' do
it 'configures mistral-api service' do
is_expected.to contain_service('mistral-api').with(
:ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
:ensure => params[:enabled] ? 'running' : 'stopped',
:name => platform_params[:api_service_name],
:enable => params[:enabled],
:hasstatus => true,
@@ -80,20 +80,12 @@ describe 'mistral::api' do
context 'with disabled service managing' do
before do
params.merge!({
:manage_service => false,
:enabled => false })
:manage_service => false
})
end
it 'configures mistral-api service' do
is_expected.to contain_service('mistral-api').with(
:ensure => nil,
:name => platform_params[:api_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'mistral-service',
)
is_expected.to contain_service('mistral-api').that_subscribes_to(nil)
it 'does not configure mistral-api service' do
is_expected.to_not contain_service('mistral-api')
end
end

18
spec/classes/mistral_engine_spec.rb
View File

@@ -34,7 +34,7 @@ describe 'mistral::engine' do
it 'configures mistral-engine service' do
is_expected.to contain_service('mistral-engine').with(
:ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
:ensure => params[:enabled] ? 'running' : 'stopped',
:name => platform_params[:engine_service_name],
:enable => params[:enabled],
:hasstatus => true,
@@ -49,20 +49,12 @@ describe 'mistral::engine' do
context 'with disabled service managing' do
before do
params.merge!({
:manage_service => false,
:enabled => false })
:manage_service => false
})
end
it 'configures mistral-engine service' do
is_expected.to contain_service('mistral-engine').with(
:ensure => nil,
:name => platform_params[:engine_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'mistral-service',
)
is_expected.to contain_service('mistral-engine').that_subscribes_to(nil)
it 'does not configure mistral-engine service' do
is_expected.to_not contain_service('mistral-engine')
end
end
end

19
spec/classes/mistral_event_engine_spec.rb
View File

@@ -31,7 +31,7 @@ describe 'mistral::event_engine' do
it 'configures mistral-event-engine service' do
is_expected.to contain_service('mistral-event-engine').with(
:ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
:ensure => params[:enabled] ? 'running' : 'stopped',
:name => platform_params[:event_engine_service_name],
:enable => params[:enabled],
:hasstatus => true,
@@ -46,21 +46,12 @@ describe 'mistral::event_engine' do
context 'with disabled service managing' do
before do
params.merge!({
:manage_service => false,
:enabled => false })
:manage_service => false
})
end
it 'configures mistral-event-engine service' do
is_expected.to contain_service('mistral-event-engine').with(
:ensure => nil,
:name => platform_params[:event_engine_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'mistral-service',
)
is_expected.to contain_service('mistral-event-engine').that_subscribes_to(nil)
it 'does not configure mistral-event-engine service' do
is_expected.to_not contain_service('mistral-event-engine')
end
end

18
spec/classes/mistral_executor_spec.rb
View File

@@ -29,7 +29,7 @@ describe 'mistral::executor' do
it 'configures mistral-executor service' do
is_expected.to contain_service('mistral-executor').with(
:ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
:ensure => params[:enabled] ? 'running' : 'stopped',
:name => platform_params[:executor_service_name],
:enable => params[:enabled],
:hasstatus => true,
@@ -44,20 +44,12 @@ describe 'mistral::executor' do
context 'with disabled service managing' do
before do
params.merge!({
:manage_service => false,
:enabled => false })
:manage_service => false
})
end
it 'configures mistral-executor service' do
is_expected.to contain_service('mistral-executor').with(
:ensure => nil,
:name => platform_params[:executor_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'mistral-service',
)
is_expected.to contain_service('mistral-executor').that_subscribes_to(nil)
it 'does not configure mistral-executor service' do
is_expected.to_not contain_service('mistral-executor')
end
end
end