From e27bb371faa3b3838022742efa1c574de743e537 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Thu, 5 Jul 2018 15:26:18 +0200 Subject: [PATCH] Correct unit file name check for heat_api_cfn validation. The verification of the heat-api-cfn service running under http, relies on checking the httpd control group tree hierarchy. In this tree, the heat_api_cfn_wsgi service name is trimmed, causing a validation error during upgrades. Change-Id: Id1c932ab0ebb1e8b155e49b01c70e53e58c00214 Closes-Bug: #1780248 --- docker/services/heat-api-cfn.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml index ddf1477a4d..3e165f4725 100644 --- a/docker/services/heat-api-cfn.yaml +++ b/docker/services/heat-api-cfn.yaml @@ -152,7 +152,7 @@ outputs: - set_fact: heat_api_cfn_enabled: heat_api_cfn_enabled_result|bool - name: Check for heat_api_cfn running under apache - shell: "httpd -t -D DUMP_VHOSTS | grep -q heat_api_cfn_wsgi" + shell: "httpd -t -D DUMP_VHOSTS | grep -q heat_api_cfn" ignore_errors: True register: heat_api_cfn_httpd_enabled_result - set_fact: @@ -172,7 +172,7 @@ outputs: when: httpd_running is undefined - name: "PreUpgrade step0,validation: Check if heat_api_cfn_wsgi is running" tags: validation - shell: systemctl status 'httpd' | grep -q heat_api_cfn_wsgi + shell: systemctl status 'httpd' | grep -q heat_api_cfn when: - heat_api_cfn_httpd_enabled|bool - httpd_running|bool