Do not define service resource when service management is disabled
Change-Id: Id7e2b1389ff2e5fe77b6087b521922a0241c706f
This commit is contained in:
parent
a1f995a738
commit
2d30b5673d
@ -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',
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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',
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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',
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user