openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove tasks that stop and disable Horizon services."

This commit is contained in:
Zuul 2019-03-29 11:39:29 +00:00 committed by Gerrit Code Review
parent 6635dc6329 abff4fd298
commit 4fea9b81bf
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
deployment/horizon/horizon-container-puppet.yaml
View File

@ -330,36 +330,7 @@ outputs:
Log files from horizon containers can be found under
/var/log/containers/horizon and /var/log/containers/httpd/horizon.
ignore_errors: true
upgrade_tasks:
- when: step|int == 0
tags: common
block:
- name: Check for horizon running under apache
shell: "httpd -t -D DUMP_VHOSTS | grep -q horizon_vhost"
ignore_errors: True
register: horizon_httpd_enabled_result
- set_fact:
horizon_httpd_enabled: "{{ horizon_httpd_enabled_result.rc == 0 }}"
- name: Check if httpd is running
command: systemctl is-active --quiet httpd
ignore_errors: True
register: httpd_running_result
when: httpd_running is undefined
- name: Set fact httpd_running
set_fact:
httpd_running: "{{ httpd_running_result.rc == 0 }}"
when: httpd_running is undefined
- name: "PreUpgrade step0,validation: Check if horizon is running"
shell: systemctl is-active --quiet httpd
when:
- horizon_httpd_enabled|bool
- httpd_running|bool
tags: validation
- name: Stop and disable horizon service (running under httpd)
when:
- step|int == 2
- httpd_running|bool
service: name=httpd state=stopped enabled=no
upgrade_tasks: []
post_upgrade_tasks:
- when: step|int == 1
import_role: