From 742f0e2d54e4785d77c8c55ed927aa18daff1658 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sat, 14 Jul 2018 13:38:28 +0200 Subject: [PATCH] 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 --- manifests/api.pp | 4 ++-- manifests/api_cfn.pp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index 515a48e6..9b8ff8cc 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -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") diff --git a/manifests/api_cfn.pp b/manifests/api_cfn.pp index 69214051..eb67b725 100644 --- a/manifests/api_cfn.pp +++ b/manifests/api_cfn.pp @@ -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")