Merge "Correct unit file name check for heat_api_cfn validation."

This commit is contained in:
Zuul
2018-07-10 14:45:50 +00:00
committed by Gerrit Code Review

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