openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Upgrades: Ensure idempotency of pacemaker services" into stable/queens

This commit is contained in:
Zuul 2019-02-26 13:37:09 +00:00 committed by Gerrit Code Review
parent b427f43683 c49911a5b0
commit 4cc9f7479f
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,11 +315,6 @@ outputs:
- name: Set fact cinder_backup_pcs_res
set_fact:
cinder_backup_pcs_res: "{{cinder_backup_pcs_res_result|succeeded}}"
- name: Cinder-Backup baremetal to container upgrade tasks
when:
- step|int == 1
- not cinder_backup_containerized|bool
block:
- name: get bootstrap nodeid
tags: common
command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
@ -327,6 +322,11 @@ outputs:
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
- name: Cinder-Backup baremetal to container upgrade tasks
when:
- step|int == 1
- not cinder_backup_containerized|bool
block:
- name: Check cluster resource status
pacemaker_resource:
resource: openstack-cinder-backup

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

@ -280,11 +280,6 @@ outputs:
- name: Set fact cinder_volume_pcs_res
set_fact:
cinder_volume_pcs_res: "{{cinder_volume_pcs_res_result|succeeded}}"
- name: Cinder-Volume baremetal to container upgrade tasks
when:
- step|int == 1
- not cinder_volume_containerized|bool
block:
- name: get bootstrap nodeid
tags: common
command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
@ -292,6 +287,11 @@ outputs:
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
- name: Cinder-Volume baremetal to container upgrade tasks
when:
- step|int == 1
- not cinder_volume_containerized|bool
block:
- name: Check cluster resource status
pacemaker_resource:
resource: openstack-cinder-volume

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

@ -291,12 +291,8 @@ outputs:
ignore_errors: true
register: manila_share_pcs_res_result
- name: Set fact manila_share_pcs_res
set_fact: "{{manila_share_pcs_res_result|succeeded}}"
- name: Manila-Share baremetal to container upgrade tasks
when:
- step|int == 1
- not manila_share_containerized|bool
block:
set_fact:
manila_share_pcs_res: "{{manila_share_pcs_res_result|succeeded}}"
- name: get bootstrap nodeid
tags: common
command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
@ -304,6 +300,11 @@ outputs:
- name: set is_bootstrap_node fact
tags: common
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
- name: Manila-Share baremetal to container upgrade tasks
when:
- step|int == 1
- not manila_share_containerized|bool
block:
- name: Check cluster resource status
pacemaker_resource:
resource: openstack-manila-share