openstack
/
puppet-zaqar
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:47:23 +00:00 committed by Gerrit Code Review
parent 862cc8b798 519643dde9
commit abc8b1ff74
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
manifests/server.pp
View File

@ -31,39 +31,36 @@ class zaqar::server(
include zaqar::params
include zaqar::policy
if $enabled {
if $manage_service {
if $manage_service {
if $enabled {
$ensure = 'running'
}
} else {
if $manage_service {
} else {
$ensure = 'stopped'
}
}
if $service_name == $::zaqar::params::service_name {
service { $::zaqar::params::service_name:
ensure => $ensure,
name => $::zaqar::params::service_name,
enable => $enabled,
hasstatus => true,
tag => 'zaqar-service',
}
if $service_name == $::zaqar::params::service_name {
service { $::zaqar::params::service_name:
ensure => $ensure,
name => $::zaqar::params::service_name,
enable => $enabled,
hasstatus => true,
tag => 'zaqar-service',
}
} elsif $service_name == 'httpd' {
service { $::zaqar::params::service_name:
ensure => 'stopped',
name => $::zaqar::params::service_name,
enable => false,
tag => ['zaqar-service'],
}
} elsif $service_name == 'httpd' {
service { $::zaqar::params::service_name:
ensure => 'stopped',
name => $::zaqar::params::service_name,
enable => false,
tag => ['zaqar-service'],
}
# we need to make sure zaqar-server is stopped before trying to start apache
Service[$::zaqar::params::service_name] -> Service[$service_name]
Service <| title == 'httpd' |> { tag +> 'zaqar-service' }
} else {
fail("Invalid service_name. Either zaqar-server/openstack-zaqar for \
# we need to make sure zaqar-server is stopped before trying to start apache
Service[$::zaqar::params::service_name] -> Service[$service_name]
Service <| title == 'httpd' |> { tag +> 'zaqar-service' }
} else {
fail("Invalid service_name. Either zaqar-server/openstack-zaqar for \
running as a standalone service, or httpd for being run by a httpd server")
}
}
}