diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2017-02-23 12:58:16 -0500 |
|---|---|---|
| committer |   Athlan-Guyot sofer <sathlang@redhat.com> | 2017-03-01 11:53:18 +0000 |
| commit | dda25e840dd5ab43d5ad6ac924306b9715072bfa (patch) | |
| tree | 80e983f10bb3252b94aa804fb98796d7ae8451cf | |
| parent | 1ab18342023458c58e6771b94c22ede89c917af3 (diff) | |
Add upgrade support for Horizon
Change-Id: I91c3c93c1571288daa78b6d24b0aa9824a2bb5c4
(cherry picked from commit db02313b2869aac0d0ddd41129eb9bebed1a24ad)
| -rw-r--r-- | ci/environments/multinode_major_upgrade.yaml | 1 | ||||
| -rw-r--r-- | puppet/services/horizon.yaml | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/ci/environments/multinode_major_upgrade.yaml b/ci/environments/multinode_major_upgrade.yaml index e5c1b411..2251cc0c 100644 --- a/ci/environments/multinode_major_upgrade.yaml +++ b/ci/environments/multinode_major_upgrade.yaml @@ -54,6 +54,7 @@ parameter_defaults: - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::Pacemaker + - OS::TripleO::Services::Horizon ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml index 2111021b..77983854 100644 --- a/puppet/services/horizon.yaml +++ b/puppet/services/horizon.yaml @@ -96,3 +96,19 @@ outputs: - horizon::django_debug: {get_param: Debug} step_config: | include ::tripleo::profile::base::horizon + # Ansible tasks to handle upgrade + upgrade_tasks: + - name: Check if httpd is deployed + command: systemctl is-enabled httpd + tags: step0,validation + ignore_errors: True + register: httpd_enabled + - name: "PreUpgrade step0,validation: Check if httpd is running" + shell: > + /usr/bin/systemctl show 'httpd' --property ActiveState | + grep '\bactive\b' + when: httpd_enabled.rc == 0 + tags: step0,validation + - name: Stop Horizon (under httpd) + tags: step2 + service: name=httpd state=stopped |