diff --git a/manifests/api.pp b/manifests/api.pp index 988a9a3..72c1d81 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -47,6 +47,13 @@ class murano::api( } else { $service_ensure = 'stopped' } + + service { 'murano-api': + ensure => $service_ensure, + name => $::murano::params::api_service_name, + enable => $enabled, + tag => 'murano-service', + } } murano_config { @@ -60,12 +67,4 @@ class murano::api( name => $::murano::params::api_package_name, tag => ['openstack', 'murano-package'], } - - service { 'murano-api': - ensure => $service_ensure, - name => $::murano::params::api_service_name, - enable => $enabled, - tag => 'murano-service', - } - } diff --git a/manifests/cfapi.pp b/manifests/cfapi.pp index b799024..1b6dbd5 100644 --- a/manifests/cfapi.pp +++ b/manifests/cfapi.pp @@ -64,6 +64,13 @@ class murano::cfapi( } else { $service_ensure = 'stopped' } + + service { 'murano-cfapi': + ensure => $service_ensure, + name => $::murano::params::cfapi_service_name, + enable => $enabled, + tag => 'murano-service', + } } murano_cfapi_config { @@ -80,12 +87,4 @@ class murano::cfapi( name => $::murano::params::cfapi_package_name, tag => ['openstack', 'murano-package'], } - - service { 'murano-cfapi': - ensure => $service_ensure, - name => $::murano::params::cfapi_service_name, - enable => $enabled, - tag => 'murano-service', - } - } diff --git a/manifests/engine.pp b/manifests/engine.pp index efe64ca..22b1c74 100644 --- a/manifests/engine.pp +++ b/manifests/engine.pp @@ -37,6 +37,13 @@ class murano::engine( } else { $service_ensure = 'stopped' } + + service { 'murano-engine': + ensure => $service_ensure, + name => $::murano::params::engine_service_name, + enable => $enabled, + tag => 'murano-service', + } } murano_config { @@ -48,12 +55,4 @@ class murano::engine( name => $::murano::params::engine_package_name, tag => ['openstack', 'murano-package'], } - - service { 'murano-engine': - ensure => $service_ensure, - name => $::murano::params::engine_service_name, - enable => $enabled, - tag => 'murano-service', - } - } diff --git a/spec/shared_examples.rb b/spec/shared_examples.rb index ae416b1..f176eec 100644 --- a/spec/shared_examples.rb +++ b/spec/shared_examples.rb @@ -53,8 +53,7 @@ shared_examples 'generic murano service' do |service| context 'while not managing service state' do let :context_params do - { :enabled => false, - :manage_service => false } + { :manage_service => false } end let :params do @@ -62,7 +61,7 @@ shared_examples 'generic murano service' do |service| end it 'does not control service state' do - is_expected.to contain_service(service[:name]).without_ensure + is_expected.to_not contain_service(service[:name]) end end end