openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Jose Luis Franco Arza 2018-07-05 15:26:18 +02:00
parent 0c0b82b908
commit e27bb371fa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/services/heat-api-cfn.yaml
View File

@ -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