Merge "Check transfer data flag to skip pacemaker normal upgrade." into stable/train

This commit is contained in:
Zuul 2020-06-09 21:26:39 +00:00 committed by Gerrit Code Review
commit 54361fe1d7
11 changed files with 30 additions and 20 deletions

View File

@ -328,7 +328,7 @@ outputs:
- name: Create hiera data to upgrade cinder_backup in a stepwise manner. - name: Create hiera data to upgrade cinder_backup in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set cinder_backup upgrade node facts in a single-node environment - name: set cinder_backup upgrade node facts in a single-node environment
set_fact: set_fact:

View File

@ -314,7 +314,7 @@ outputs:
- name: Create hiera data to upgrade cinder_volume in a stepwise manner. - name: Create hiera data to upgrade cinder_volume in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set cinder_volume upgrade node facts in a single-node environment - name: set cinder_volume upgrade node facts in a single-node environment
set_fact: set_fact:

View File

@ -469,7 +469,7 @@ outputs:
- name: Create hiera data to upgrade mysql in a stepwise manner. - name: Create hiera data to upgrade mysql in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set mysql upgrade node facts in a single-node environment - name: set mysql upgrade node facts in a single-node environment
set_fact: set_fact:

View File

@ -403,7 +403,7 @@ outputs:
- name: Create hiera data to upgrade redis in a stepwise manner. - name: Create hiera data to upgrade redis in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set redis upgrade node facts in a single-node environment - name: set redis upgrade node facts in a single-node environment
set_fact: set_fact:

View File

@ -521,7 +521,7 @@ outputs:
- name: Create hiera data to upgrade haproxy in a stepwise manner. - name: Create hiera data to upgrade haproxy in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set haproxy upgrade node facts in a single-node environment - name: set haproxy upgrade node facts in a single-node environment
set_fact: set_fact:

View File

@ -309,7 +309,7 @@ outputs:
- name: Create hiera data to upgrade manila_share in a stepwise manner. - name: Create hiera data to upgrade manila_share in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set manila_share upgrade node facts in a single-node environment - name: set manila_share upgrade node facts in a single-node environment
set_fact: set_fact:

View File

@ -420,7 +420,7 @@ outputs:
- name: Create hiera data to upgrade ovn_dbs in a stepwise manner. - name: Create hiera data to upgrade ovn_dbs in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set ovn_dbs upgrade node facts in a single-node environment - name: set ovn_dbs upgrade node facts in a single-node environment
set_fact: set_fact:

View File

@ -97,10 +97,6 @@ parameters:
tag: system.pacemaker tag: system.pacemaker
file: /var/log/host/pacemaker.log file: /var/log/host/pacemaker.log
startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}" startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}"
UpgradeLeappEnabled:
description: Use Leapp for operating system upgrade
type: boolean
default: false
ContainerCli: ContainerCli:
type: string type: string
default: 'podman' default: 'podman'
@ -198,19 +194,33 @@ outputs:
- name: upgrade step 0 - name: upgrade step 0
when: step|int == 0 when: step|int == 0
block: block:
- name: Set fact upgrade_leapp_enabled # If performing an upgrade which requires operating system upgrading
# a transfer data step needs to be run. During this step, the whole
# pacemaker cluster is stopped so we can't check the cluster status.
# Once the transfer_data step is executed, a flag file is stored.
# This code checks the existence of this file to know if we should
# avoid doing a normal pacemaker upgrade or not. As with the
# operating system upgrade a new cluster will be created in which
# the other nodes will be added.
- name: check flag file existence in destination host
stat:
path: "/var/lib/tripleo/transfer-flags/var-lib-mysql"
register: tripleo_transfer_flag_stat
become: true
delegate_to: "{{ mysql_short_bootstrap_node_name }}"
- name: Set fact cluster_recreate
set_fact: set_fact:
upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled} cluster_recreate: "{{ tripleo_transfer_flag_stat.stat.exists|bool }}"
- name: Check pacemaker cluster running before upgrade - name: Check pacemaker cluster running before upgrade
tags: validation tags: validation
pacemaker_cluster: state=online check_and_fail=true pacemaker_cluster: state=online check_and_fail=true
async: 30 async: 30
poll: 4 poll: 4
when: not upgrade_leapp_enabled|bool when: not cluster_recreate|bool
- name: Create hiera data to upgrade pacemaker in a stepwise manner. - name: Create hiera data to upgrade pacemaker in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set pacemaker upgrade node facts in a single-node environment - name: set pacemaker upgrade node facts in a single-node environment
set_fact: set_fact:
@ -280,13 +290,13 @@ outputs:
block: block:
- name: Stop pacemaker cluster - name: Stop pacemaker cluster
pacemaker_cluster: state=offline pacemaker_cluster: state=offline
when: not upgrade_leapp_enabled when: not cluster_recreate|bool
- name: upgrade step 4 - name: upgrade step 4
when: step|int == 4 when: step|int == 4
block: block:
- name: Start pacemaker cluster - name: Start pacemaker cluster
pacemaker_cluster: state=online pacemaker_cluster: state=online
when: not upgrade_leapp_enabled when: not cluster_recreate|bool
external_upgrade_tasks: external_upgrade_tasks:
- when: - when:
- step|int == 1 - step|int == 1

View File

@ -363,7 +363,7 @@ outputs:
- name: Create hiera data to upgrade oslo messaging notify in a stepwise manner. - name: Create hiera data to upgrade oslo messaging notify in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set oslo_messaging_notify upgrade node facts in a single-node environment - name: set oslo_messaging_notify upgrade node facts in a single-node environment
set_fact: set_fact:

View File

@ -364,7 +364,7 @@ outputs:
- name: Create hiera data to upgrade rabbitmq in a stepwise manner. - name: Create hiera data to upgrade rabbitmq in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set rabbitmq upgrade node facts in a single-node environment - name: set rabbitmq upgrade node facts in a single-node environment
set_fact: set_fact:

View File

@ -369,7 +369,7 @@ outputs:
- name: Create hiera data to upgrade oslo messaging rpc in a stepwise manner. - name: Create hiera data to upgrade oslo messaging rpc in a stepwise manner.
when: when:
- step|int == 1 - step|int == 1
- upgrade_leapp_enabled|bool - cluster_recreate|bool
block: block:
- name: set oslo_messaging_rpc upgrade node facts in a single-node environment - name: set oslo_messaging_rpc upgrade node facts in a single-node environment
set_fact: set_fact: