openstack
/
puppet-heat
Code Issues Proposed changes

Fix bug introduced by notify apache for heat-api 

The change [1] was wrong since it uses the wrong resource
name for the puppetlabs-apache Service defintion [2].

Instead of the revert this fixes it by changing it back to
the proper variable which has the value 'httpd'.

[1] https://review.openstack.org/#/c/581411/
[2] https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/service.pp#L43

Change-Id: Ic943293d1ff9aa33c8095feb2b14d96a30a37914
This commit is contained in:
Tobias Urdin 2018-07-14 13:38:28 +02:00
parent 1e365dc833
commit 742f0e2d54
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")