openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Skip operating system upgrade tasks via UpgradeLeappEnabled param."

Browse Source
This commit is contained in:
Zuul 2020-05-14 01:32:43 +00:00 committed by Gerrit Code Review
commit cc36c00622
12 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/cinder/cinder-backup-pacemaker-puppet.yaml
View File

@ -343,6 +343,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:

1
deployment/cinder/cinder-volume-pacemaker-puppet.yaml
View File

@ -330,6 +330,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:

1
deployment/database/mysql-pacemaker-puppet.yaml
View File

@ -504,6 +504,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:

4
deployment/database/redis-pacemaker-puppet.yaml
View File

@ -415,8 +415,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:

1
deployment/haproxy/haproxy-pacemaker-puppet.yaml
View File

@ -536,6 +536,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:

1
deployment/manila/manila-share-pacemaker-puppet.yaml
View File

@ -309,6 +309,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:

4
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
View File

@ -440,8 +440,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:

14
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
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

1
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
View File

@ -378,6 +378,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:

1
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
View File

@ -379,6 +379,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:

1
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
View File

@ -384,6 +384,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:

2
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
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