Skip operating system upgrade tasks via UpgradeLeappEnabled param.

The operating system from RHEL 7 to RHEL 8 was required during the upgrade
from Rocky to Stein, however it isn't anymore for the upgrade from Stein to
Train. But we can't get rid of these tasks as they will be required for the
three releases jump from Queens to Train.

The solution has been making use of an existing heat paramter
UpgradeLeappEnabled which will be set when an Operating System is required.
Before, this parameter defaulted to true, but from now on it
defaults to false and will be set to true during the prepare step.

Change-Id: I7ac0c74726f7bbeb773d54f6909c5f647717f79a
(cherry picked from commit 9405639e55)
This commit is contained in:
Jose Luis Franco Arza 2020-03-16 21:53:19 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 0602d12e5f
commit 2367b8aa5a
12 changed files with 21 additions and 11 deletions

View File

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

View File

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

View File

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

View File

@ -399,8 +399,10 @@ outputs:
command: pcs resource bundle update redis-bundle storage-map add id=redis-log source-dir=/var/log/containers/redis target-dir=/var/log/redis options=rw
- name: Update the redis bundle to use the new container image name
command: "pcs resource bundle update redis-bundle container image={{redis_image_latest}}"
- when:
- name: Create hiera data to upgrade redis in a stepwise manner.
when:
- step|int == 1
- upgrade_leapp_enabled|bool
block:
- name: set redis upgrade node facts in a single-node environment
set_fact:

View File

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

View File

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

View File

@ -416,8 +416,10 @@ outputs:
register: output
retries: 5
until: output.rc == 0
- when:
- name: Create hiera data to upgrade ovn_dbs in a stepwise manner.
when:
- step|int == 1
- upgrade_leapp_enabled|bool
block:
- name: set ovn_dbs upgrade node facts in a single-node environment
set_fact:

View File

@ -100,7 +100,7 @@ parameters:
UpgradeLeappEnabled:
description: Use Leapp for operating system upgrade
type: boolean
default: true
default: false
ContainerCli:
type: string
default: 'podman'
@ -197,18 +197,20 @@ outputs:
upgrade_tasks:
- name: upgrade step 0
when: step|int == 0
vars:
upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
block:
- name: Set fact upgrade_leapp_enabled
set_fact:
upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
- name: Check pacemaker cluster running before upgrade
tags: validation
pacemaker_cluster: state=online check_and_fail=true
async: 30
poll: 4
when: not upgrade_leapp_enabled|bool
- name: upgrade step 1
- name: Create hiera data to upgrade pacemaker in a stepwise manner.
when:
- step|int == 1
- upgrade_leapp_enabled|bool
block:
- name: set pacemaker upgrade node facts in a single-node environment
set_fact:
@ -275,16 +277,12 @@ outputs:
when: pacemaker_short_node_names_upgraded | length == pacemaker_short_node_names | length
- name: upgrade step 2
when: step|int == 2
vars:
upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
block:
- name: Stop pacemaker cluster
pacemaker_cluster: state=offline
when: not upgrade_leapp_enabled
- name: upgrade step 4
when: step|int == 4
vars:
upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
block:
- name: Start pacemaker cluster
pacemaker_cluster: state=online

View File

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

View File

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

View File

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

View File

@ -54,7 +54,7 @@ parameters:
UpgradeLeappEnabled:
description: Use Leapp for operating system upgrade
type: boolean
default: true
default: false
UpgradeLeappDebug:
description: Print debugging output when running Leapp
type: boolean