openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Upgrades: Ensure idempotency of pacemaker services"

Browse Source
This commit is contained in:
Zuul 2018-11-27 15:58:24 +00:00 committed by Gerrit Code Review
commit 22bf2b8364
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 - name: Set fact cinder_backup_pcs_res
set_fact: set_fact:
cinder_backup_pcs_res: "{{cinder_backup_pcs_res_result|succeeded}}" 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 - name: Cinder-Backup baremetal to container upgrade tasks
when: when:
- step|int == 1 - step|int == 1
- not cinder_backup_containerized|bool - not cinder_backup_containerized|bool
block: 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 - name: Check cluster resource status
pacemaker_resource: pacemaker_resource:
resource: openstack-cinder-backup 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 - name: Set fact cinder_volume_pcs_res
set_fact: set_fact:
cinder_volume_pcs_res: "{{cinder_volume_pcs_res_result|succeeded}}" 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 - name: Cinder-Volume baremetal to container upgrade tasks
when: when:
- step|int == 1 - step|int == 1
- not cinder_volume_containerized|bool - not cinder_volume_containerized|bool
block: 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 - name: Check cluster resource status
pacemaker_resource: pacemaker_resource:
resource: openstack-cinder-volume 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 - name: Set fact manila_share_pcs_res
set_fact: set_fact:
manila_share_pcs_res: "{{manila_share_pcs_res_result|succeeded}}" 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 - name: Manila-Share baremetal to container upgrade tasks
when: when:
- step|int == 1 - step|int == 1
- not manila_share_containerized|bool - not manila_share_containerized|bool
block: 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 - name: Check cluster resource status
pacemaker_resource: pacemaker_resource:
resource: openstack-manila-share resource: openstack-manila-share