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:
parent
1e365dc833
commit
742f0e2d54
@ -115,9 +115,9 @@ class heat::api (
|
|||||||
}
|
}
|
||||||
|
|
||||||
# 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[$::apache::params::service_name]
|
Service['heat-api'] -> Service[$service_name]
|
||||||
# the apache service is untagged so add it to the service section manually
|
# 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 {
|
} 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")
|
||||||
|
@ -118,9 +118,9 @@ class heat::api_cfn (
|
|||||||
}
|
}
|
||||||
|
|
||||||
# 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[$::apache::params::service_name]
|
Service['heat-api-cfn'] -> Service[$service_name]
|
||||||
# the apache service is untagged so add it to the service section manually
|
# 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 {
|
} 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")
|
||||||
|
Loading…
Reference in New Issue
Block a user