openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Upgrades: Ensure idempotency of pacemaker services 

The fact is_bootstrap_node has to be always present regardless the
state of containerization of the service.

Change-Id: Ie39f753494d87b7cfab28d92fc6783db012cc10f
Resolves: rhbz#1652205
Closes-Bug: #1804488
This commit is contained in:
Lukas Bezdicka 2018-11-22 14:53:16 +01:00
parent 07241f33d1
commit a3a7099a37
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/services/pacemaker/cinder-backup.yaml
View File

@ -324,14 +324,14 @@ outputs:
- name: Set fact cinder_backup_pcs_res
set_fact:
cinder_backup_pcs_res: "{{cinder_backup_pcs_res_result|succeeded}}"
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{cinder_backup_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Cinder-Backup baremetal to container upgrade tasks
when:
- step|int == 1
- not cinder_backup_containerized|bool
block:
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{cinder_backup_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Check cluster resource status
pacemaker_resource:
resource: openstack-cinder-backup

6
docker/services/pacemaker/cinder-volume.yaml
View File

@ -290,14 +290,14 @@ outputs:
- name: Set fact cinder_volume_pcs_res
set_fact:
cinder_volume_pcs_res: "{{cinder_volume_pcs_res_result|succeeded}}"
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{cinder_volume_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Cinder-Volume baremetal to container upgrade tasks
when:
- step|int == 1
- not cinder_volume_containerized|bool
block:
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{cinder_volume_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Check cluster resource status
pacemaker_resource:
resource: openstack-cinder-volume

6
docker/services/pacemaker/manila-share.yaml
View File

@ -291,14 +291,14 @@ outputs:
- name: Set fact manila_share_pcs_res
set_fact:
manila_share_pcs_res: "{{manila_share_pcs_res_result|succeeded}}"
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{manila_share_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Manila-Share baremetal to container upgrade tasks
when:
- step|int == 1
- not manila_share_containerized|bool
block:
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{manila_share_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Check cluster resource status
pacemaker_resource:
resource: openstack-manila-share