FFU: Upgrades: fix pacemaker checks

Check if pacemaker resource is defined, not if it's running.
Ensure we try disabling pacemaker resources during FFU.

Change-Id: I9be9118490a28ee9c24d9c8c89a8daee75e5b817
This commit is contained in:
Lukas Bezdicka
2018-02-24 23:39:01 +01:00
parent d04bb9bdd9
commit 3f38dd6e46
4 changed files with 73 additions and 26 deletions

View File

@@ -171,21 +171,3 @@ outputs:
- name: Start pacemaker cluster
when: step|int == 4
pacemaker_cluster: state=online
fast_forward_upgrade_tasks:
- name: get internal_api_virtual_ip
tags: common
command: hiera -c /etc/puppet/hiera.yaml tripleo::keepalived::internal_api_virtual_ip
register: internal_api_virtual_ip
- name: Disable all pacemaker resources except Api virtual ip, haproxy and galera
shell: |
pcs resource show --full |\
grep Resource |\
grep -v galera |\
grep -v haproxy |\
grep -v {{internal_api_virtual_ip.stdout}} |\
awk '{print $2}' |\
xargs pcs resource disable
when:
- step|int == 3
- release == 'ocata'
- is_bootstrap_node|bool