openstack/puppet-heat
Code Issues Proposed changes

Improve restarting Apache

Browse Source 
The previous approach could lead to restarting Apache after
Anchor['heat::service::end']. The new approach is already used in other
Puppet modules and guarantees restarting Apache between the service
anchors.

Change-Id: Ia4ccc8a6477f490f42b588b3e6a9d5c0f7ff6d88
This commit is contained in:
Matthias Bastian 2018-08-14 16:55:39 +02:00
parent ec5d55c9ac
commit 9e98fa3cec
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/api.pp
View File

@ -113,11 +113,10 @@ class heat::api (
enable => false, enable => false,
tag => ['heat-service'], tag => ['heat-service'],
} }
Service <| title == 'httpd' |> { tag +> 'heat-service' }
# we need to make sure heat-api/eventlet is stopped before trying to start apache # we need to make sure heat-api/eventlet is stopped before trying to start apache
Service['heat-api'] -> Service[$service_name] Service['heat-api'] -> Service[$service_name]
# the apache service is untagged so add it to the service section manually
Anchor['heat::service::begin'] ~> Service[$service_name]
} else { } else {
fail("Invalid service_name. Either heat-api/openstack-heat-api for \ fail("Invalid service_name. Either heat-api/openstack-heat-api for \
running as a standalone service, or httpd for being run by a httpd server") running as a standalone service, or httpd for being run by a httpd server")

3
manifests/api_cfn.pp
View File

@ -116,11 +116,10 @@ class heat::api_cfn (
enable => false, enable => false,
tag => ['heat-service'], tag => ['heat-service'],
} }
Service <| title == 'httpd' |> { tag +> 'heat-service' }
# we need to make sure heat-api-cfn/eventlet is stopped before trying to start apache # we need to make sure heat-api-cfn/eventlet is stopped before trying to start apache
Service['heat-api-cfn'] -> Service[$service_name] Service['heat-api-cfn'] -> Service[$service_name]
# the apache service is untagged so add it to the service section manually
Anchor['heat::service::begin'] ~> Service[$service_name]
} else { } else {
fail("Invalid service_name. Either heat-api-cfn/openstack-heat-api-cfn for \ fail("Invalid service_name. Either heat-api-cfn/openstack-heat-api-cfn for \
running as a standalone service, or httpd for being run by a httpd server") running as a standalone service, or httpd for being run by a httpd server")