openstack
/
puppet-vitrage
Code Issues Proposed changes

Merge "Do not define service resource when service management is disabled"

This commit is contained in:
Zuul 2022-02-15 10:29:41 +00:00 committed by Gerrit Code Review
parent b810c08956 3601a311b2
commit 26f0e1f90e
8 changed files with 64 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
manifests/api.pp
View File

@ -67,35 +67,35 @@ class vitrage::api (
} else {
$service_ensure = 'stopped'
}
}
if $service_name == $::vitrage::params::api_service_name {
service { 'vitrage-api':
ensure => $service_ensure,
name => $::vitrage::params::api_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'vitrage-service',
}
} elsif $service_name == 'httpd' {
service { 'vitrage-api':
ensure => 'stopped',
name => $::vitrage::params::api_service_name,
enable => false,
tag => 'vitrage-service',
}
if $service_name == $::vitrage::params::api_service_name {
service { 'vitrage-api':
ensure => $service_ensure,
name => $::vitrage::params::api_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'vitrage-service',
}
} elsif $service_name == 'httpd' {
service { 'vitrage-api':
ensure => 'stopped',
name => $::vitrage::params::api_service_name,
enable => false,
tag => 'vitrage-service',
}
# we need to make sure vitrage-api/eventlet is stopped before trying to start apache
Service['vitrage-api'] -> Service[$service_name]
} else {
fail("Invalid service_name. Either vitrage/openstack-vitrage-api for running \
# we need to make sure vitrage-api/eventlet is stopped before trying to start apache
Service['vitrage-api'] -> Service[$service_name]
} else {
fail("Invalid service_name. Either vitrage/openstack-vitrage-api for running \
as a standalone service, or httpd for being run by a httpd server")
}
}
vitrage_config {
'api/host' : value => $host;
'api/port' : value => $port;
'api/host' : value => $host;
'api/port' : value => $port;
}
oslo::middleware { 'vitrage_config':

17
manifests/graph.pp
View File

@ -34,15 +34,14 @@ class vitrage::graph (
} else {
$service_ensure = 'stopped'
}
}
Package['vitrage'] -> Service['vitrage-graph']
service { 'vitrage-graph':
ensure => $service_ensure,
name => $::vitrage::params::graph_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'vitrage-service',
service { 'vitrage-graph':
ensure => $service_ensure,
name => $::vitrage::params::graph_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'vitrage-service',
}
}
}

17
manifests/notifier.pp
View File

@ -49,15 +49,14 @@ class vitrage::notifier (
} else {
$service_ensure = 'stopped'
}
}
Package['vitrage'] -> Service['vitrage-notifier']
service { 'vitrage-notifier':
ensure => $service_ensure,
name => $::vitrage::params::notifier_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'vitrage-service',
service { 'vitrage-notifier':
ensure => $service_ensure,
name => $::vitrage::params::notifier_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'vitrage-service',
}
}
}

24
manifests/persistor.pp
View File

@ -28,24 +28,24 @@ class vitrage::persistor (
tag => ['openstack', 'vitrage-package']
}
vitrage_config {
'persistency/enable_persistency': value => $enabled;
}
if $manage_service {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
}
vitrage_config {
'persistency/enable_persistency': value => $enabled;
}
service { 'vitrage-persistor':
ensure => $service_ensure,
name => $::vitrage::params::persistor_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'vitrage-service',
service { 'vitrage-persistor':
ensure => $service_ensure,
name => $::vitrage::params::persistor_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'vitrage-service',
}
}
}

16
spec/classes/vitrage_api_spec.rb
View File

@ -11,7 +11,6 @@ describe 'vitrage::api' do
let :params do
{ :enabled => true,
:manage_service => true,
:package_ensure => 'latest',
:port => '8999',
:host => '0.0.0.0',
@ -49,7 +48,7 @@ describe 'vitrage::api' do
it 'configures vitrage-api service' do
is_expected.to contain_service('vitrage-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,
@ -86,18 +85,11 @@ describe 'vitrage::api' do
before do
params.merge!({
:manage_service => false,
:enabled => false })
})
end
it 'configures vitrage-api service' do
is_expected.to contain_service('vitrage-api').with(
:ensure => nil,
:name => platform_params[:api_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'vitrage-service',
)
it 'does not configure vitrage-api service' do
is_expected.to_not contain_service('vitrage-api')
end
end

14
spec/classes/vitrage_graph_spec.rb
View File

@ -53,19 +53,11 @@ describe 'vitrage::graph' do
context 'when service management is disabled' do
let :params do
{ :enabled => false,
:manage_service => false }
{ :manage_service => false }
end
it 'configures vitrage-graph service' do
is_expected.to contain_service('vitrage-graph').with(
:ensure => nil,
:name => platform_params[:graph_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'vitrage-service',
)
it 'does not configure vitrage-graph service' do
is_expected.to_not contain_service('vitrage-graph')
end
end
end

14
spec/classes/vitrage_notifier_spec.rb
View File

@ -57,19 +57,11 @@ describe 'vitrage::notifier' do
context 'when service management is disabled' do
let :params do
{ :enabled => false,
:manage_service => false }
{ :manage_service => false }
end
it 'configures vitrage-notifier service' do
is_expected.to contain_service('vitrage-notifier').with(
:ensure => nil,
:name => platform_params[:notifier_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'vitrage-service',
)
it 'does not configure vitrage-notifier service' do
is_expected.to_not contain_service('vitrage-notifier')
end
end

14
spec/classes/vitrage_persistor_spec.rb
View File

@ -60,19 +60,11 @@ describe 'vitrage::persistor' do
context 'when service management is disabled' do
let :params do
{ :enabled => false,
:manage_service => false }
{ :manage_service => false }
end
it 'configures vitrage-persistor service' do
is_expected.to contain_service('vitrage-persistor').with(
:ensure => nil,
:name => platform_params[:persistor_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => 'vitrage-service',
)
it 'does not configure vitrage-persistor service' do
is_expected.to_not contain_service('vitrage-persistor')
end
end
end