openstack/puppet-heat
Code Issues Proposed changes

Merge "Fix bug introduced by notify apache for heat-api"

Browse Source
This commit is contained in:
Zuul 2018-07-16 10:50:48 +00:00 committed by Gerrit Code Review
commit 65f64ebd10
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

@ -115,9 +115,9 @@ class heat::api (
}
# we need to make sure heat-api/eventlet is stopped before trying to start apache
Service['heat-api'] -> Service[$::apache::params::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[$::apache::params::service_name]
Anchor['heat::service::begin'] ~> Service[$service_name]
} else {
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")

4
manifests/api_cfn.pp
View File

@ -118,9 +118,9 @@ class heat::api_cfn (
}
# we need to make sure heat-api-cfn/eventlet is stopped before trying to start apache
Service['heat-api-cfn'] -> Service[$::apache::params::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[$::apache::params::service_name]
Anchor['heat::service::begin'] ~> Service[$service_name]
} else {
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")