From ad5de59da383fb7dd4aa2ecf283d611e520b3f44 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 24 Jan 2022 09:19:15 +0900 Subject: [PATCH] Do not declare service resource when manage_service is false Change-Id: I4922f159985adb0e97daeb41d842d47ba8bee5fa --- manifests/api.pp | 46 +++++++++++------------ manifests/engine.pp | 16 ++++---- manifests/event_engine.pp | 16 ++++---- manifests/executor.pp | 16 ++++---- spec/classes/mistral_api_spec.rb | 18 +++------ spec/classes/mistral_engine_spec.rb | 18 +++------ spec/classes/mistral_event_engine_spec.rb | 19 +++------- spec/classes/mistral_executor_spec.rb | 18 +++------ 8 files changed, 67 insertions(+), 100 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index b398108..39a3e4a 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -92,31 +92,31 @@ class mistral::api ( } else { $service_ensure = 'stopped' } - } - if $service_name == $::mistral::params::api_service_name { - service { 'mistral-api': - ensure => $service_ensure, - name => $::mistral::params::api_service_name, - enable => $enabled, - hasstatus => true, - hasrestart => true, - tag => 'mistral-service', - } - } elsif $service_name == 'httpd' { - service { 'mistral-api': - ensure => 'stopped', - name => $::mistral::params::api_service_name, - enable => false, - tag => 'mistral-service', - } - Service <| title == 'httpd' |> { tag +> 'mistral-service' } + if $service_name == $::mistral::params::api_service_name { + service { 'mistral-api': + ensure => $service_ensure, + name => $::mistral::params::api_service_name, + enable => $enabled, + hasstatus => true, + hasrestart => true, + tag => 'mistral-service', + } + } elsif $service_name == 'httpd' { + service { 'mistral-api': + ensure => 'stopped', + name => $::mistral::params::api_service_name, + enable => false, + tag => 'mistral-service', + } + Service <| title == 'httpd' |> { tag +> 'mistral-service' } - # we need to make sure mistral-api s stopped before trying to start apache - Service['mistral-api'] -> Service[$service_name] - } else { - fail("Invalid service_name. Either mistral/openstack-mistral-api for running \ -as a standalone service, or httpd for being run by a httpd server") + # we need to make sure mistral-api s stopped before trying to start apache + Service['mistral-api'] -> Service[$service_name] + } else { + 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 { diff --git a/manifests/engine.pp b/manifests/engine.pp index 72346b9..aa3a1f7 100644 --- a/manifests/engine.pp +++ b/manifests/engine.pp @@ -74,15 +74,15 @@ class mistral::engine ( } else { $service_ensure = 'stopped' } - } - service { 'mistral-engine': - ensure => $service_ensure, - name => $::mistral::params::engine_service_name, - enable => $enabled, - hasstatus => true, - hasrestart => true, - tag => 'mistral-service', + service { 'mistral-engine': + ensure => $service_ensure, + name => $::mistral::params::engine_service_name, + enable => $enabled, + hasstatus => true, + hasrestart => true, + tag => 'mistral-service', + } } mistral_config { diff --git a/manifests/event_engine.pp b/manifests/event_engine.pp index 696cde7..3d31ff3 100644 --- a/manifests/event_engine.pp +++ b/manifests/event_engine.pp @@ -52,15 +52,15 @@ class mistral::event_engine ( } else { $service_ensure = 'stopped' } - } - service { 'mistral-event-engine': - ensure => $service_ensure, - name => $::mistral::params::event_engine_service_name, - enable => $enabled, - hasstatus => true, - hasrestart => true, - tag => 'mistral-service', + service { 'mistral-event-engine': + ensure => $service_ensure, + name => $::mistral::params::event_engine_service_name, + enable => $enabled, + hasstatus => true, + hasrestart => true, + tag => 'mistral-service', + } } mistral_config { diff --git a/manifests/executor.pp b/manifests/executor.pp index f537ab2..fccb282 100644 --- a/manifests/executor.pp +++ b/manifests/executor.pp @@ -52,15 +52,15 @@ class mistral::executor ( } else { $service_ensure = 'stopped' } - } - service { 'mistral-executor': - ensure => $service_ensure, - name => $::mistral::params::executor_service_name, - enable => $enabled, - hasstatus => true, - hasrestart => true, - tag => 'mistral-service', + service { 'mistral-executor': + ensure => $service_ensure, + name => $::mistral::params::executor_service_name, + enable => $enabled, + hasstatus => true, + hasrestart => true, + tag => 'mistral-service', + } } mistral_config { diff --git a/spec/classes/mistral_api_spec.rb b/spec/classes/mistral_api_spec.rb index 57a1657..34d0367 100644 --- a/spec/classes/mistral_api_spec.rb +++ b/spec/classes/mistral_api_spec.rb @@ -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 diff --git a/spec/classes/mistral_engine_spec.rb b/spec/classes/mistral_engine_spec.rb index 7d62118..414edd6 100644 --- a/spec/classes/mistral_engine_spec.rb +++ b/spec/classes/mistral_engine_spec.rb @@ -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 diff --git a/spec/classes/mistral_event_engine_spec.rb b/spec/classes/mistral_event_engine_spec.rb index 7feeecd..30d6085 100644 --- a/spec/classes/mistral_event_engine_spec.rb +++ b/spec/classes/mistral_event_engine_spec.rb @@ -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 diff --git a/spec/classes/mistral_executor_spec.rb b/spec/classes/mistral_executor_spec.rb index 7c10bfb..2ae3d8f 100644 --- a/spec/classes/mistral_executor_spec.rb +++ b/spec/classes/mistral_executor_spec.rb @@ -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