diff --git a/manifests/api.pp b/manifests/api.pp index 1123cd2a..515a48e6 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -115,7 +115,9 @@ class heat::api ( } # 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[$::apache::params::service_name] + # the apache service is untagged so add it to the service section manually + Anchor['heat::service::begin'] ~> Service[$::apache::params::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") diff --git a/manifests/api_cfn.pp b/manifests/api_cfn.pp index 20fc35c5..69214051 100644 --- a/manifests/api_cfn.pp +++ b/manifests/api_cfn.pp @@ -118,7 +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[$service_name] + Service['heat-api-cfn'] -> Service[$::apache::params::service_name] + # the apache service is untagged so add it to the service section manually + Anchor['heat::service::begin'] ~> Service[$::apache::params::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") diff --git a/releasenotes/notes/restart-apache-fa203227fefc67f8.yaml b/releasenotes/notes/restart-apache-fa203227fefc67f8.yaml new file mode 100644 index 00000000..ca19cfbe --- /dev/null +++ b/releasenotes/notes/restart-apache-fa203227fefc67f8.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - Deal with API being run using Apache when restarting the API (e.g. due to + configuration changes)