Make UpgradeLeappDevelSkip per-role

When specific roles are deployed, for example CephStorage,
then the parameters for UpgradeLeappDevelSkip are different
to all other roles.

This change makes UpgradeLeappDevelSkip a per-role parameter.

Included in this is the appropriate tagging for the other
parameters which had the same work done in:

- https://review.opendev.org/779522
- https://review.opendev.org/774537

Release notes are included for all of the above too.

Related-Bug: rhbz#1962365

Change-Id: I522951cc7ec6034bb6287dd144a9fc433c0090e0
This commit is contained in:
Jesse Pretorius (odyssey4me) 2021-06-09 18:33:08 +01:00
parent 776d375ff0
commit dcddeb3b91
5 changed files with 27 additions and 1 deletions

View File

@ -48,6 +48,8 @@ parameters:
Command or script snippet to run on all overcloud nodes to Command or script snippet to run on all overcloud nodes to
initialize the upgrade process. E.g. a repository switch. initialize the upgrade process. E.g. a repository switch.
default: '' default: ''
tags:
- role_specific
UpgradeInitCommonCommand: UpgradeInitCommonCommand:
type: string type: string
description: | description: |

View File

@ -45,6 +45,8 @@ parameters:
development/testing. For example, LEAPP_DEVEL_SKIP_RHSM=1. development/testing. For example, LEAPP_DEVEL_SKIP_RHSM=1.
type: string type: string
default: '' default: ''
tags:
- role_specific
UpgradeLeappCommandOptions: UpgradeLeappCommandOptions:
description: | description: |
In case or using UpgradeLeappDevelSkip with LEAPP_NO_RHSM=1 user In case or using UpgradeLeappDevelSkip with LEAPP_NO_RHSM=1 user
@ -52,6 +54,8 @@ parameters:
leapp to use these repositories for the upgrade process. leapp to use these repositories for the upgrade process.
type: string type: string
default: '' default: ''
tags:
- role_specific
UpgradeLeappRebootTimeout: UpgradeLeappRebootTimeout:
description: Timeout (seconds) for the OS upgrade phase via Leapp description: Timeout (seconds) for the OS upgrade phase via Leapp
type: number type: number
@ -66,16 +70,22 @@ parameters:
default: [] default: []
description: List of packages to remove during Leapp upgrade. description: List of packages to remove during Leapp upgrade.
type: comma_delimited_list type: comma_delimited_list
tags:
- role_specific
UpgradeLeappToInstall: UpgradeLeappToInstall:
default: [] default: []
description: List of packages to install after Leapp upgrade. description: List of packages to install after Leapp upgrade.
type: comma_delimited_list type: comma_delimited_list
tags:
- role_specific
UpgradeInitCommand: UpgradeInitCommand:
type: string type: string
description: | description: |
Command or script snippet to run on all overcloud nodes to Command or script snippet to run on all overcloud nodes to
initialize the upgrade process. E.g. a repository switch. initialize the upgrade process. E.g. a repository switch.
default: '' default: ''
tags:
- role_specific
UpgradeInitCommonCommand: UpgradeInitCommonCommand:
type: string type: string
description: | description: |
@ -101,6 +111,8 @@ parameters:
module[mandatory], stream[mandatory] and profile[optional]. If the profile module[mandatory], stream[mandatory] and profile[optional]. If the profile
is not specified 'common' will be used instead. is not specified 'common' will be used instead.
type: json type: json
tags:
- role_specific
resources: resources:
RoleParametersValue: RoleParametersValue:
@ -111,6 +123,7 @@ resources:
map_replace: map_replace:
- map_replace: - map_replace:
- dnf_module_list: DnfStreams - dnf_module_list: DnfStreams
upgrade_leapp_devel_skip: UpgradeLeappDevelSkip
upgrade_leapp_command_options: UpgradeLeappCommandOptions upgrade_leapp_command_options: UpgradeLeappCommandOptions
upgrade_leapp_to_remove: UpgradeLeappToRemove upgrade_leapp_to_remove: UpgradeLeappToRemove
upgrade_leapp_to_install: UpgradeLeappToInstall upgrade_leapp_to_install: UpgradeLeappToInstall
@ -118,6 +131,7 @@ resources:
- values: {get_param: [RoleParameters]} - values: {get_param: [RoleParameters]}
- values: - values:
DnfStreams: {get_param: DnfStreams} DnfStreams: {get_param: DnfStreams}
UpgradeLeappDevelSkip: {get_param: UpgradeLeappDevelSkip}
UpgradeLeappCommandOptions: {get_param: UpgradeLeappCommandOptions} UpgradeLeappCommandOptions: {get_param: UpgradeLeappCommandOptions}
UpgradeLeappToRemove: {get_param: UpgradeLeappToRemove} UpgradeLeappToRemove: {get_param: UpgradeLeappToRemove}
UpgradeLeappToInstall: {get_param: UpgradeLeappToInstall} UpgradeLeappToInstall: {get_param: UpgradeLeappToInstall}
@ -152,7 +166,7 @@ outputs:
ansible_facts['distribution'] == 'RedHat' and ansible_facts['distribution'] == 'RedHat' and
ansible_facts['distribution_major_version'] is version('7', '==') }} ansible_facts['distribution_major_version'] is version('7', '==') }}
upgrade_leapp_debug: {get_param: UpgradeLeappDebug} upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip} upgrade_leapp_devel_skip: {get_attr: [RoleParametersValue, value, 'upgrade_leapp_devel_skip']}
upgrade_leapp_command_options: {get_attr: [RoleParametersValue, value, 'upgrade_leapp_command_options']} upgrade_leapp_command_options: {get_attr: [RoleParametersValue, value, 'upgrade_leapp_command_options']}
upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout} upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
upgrade_leapp_post_reboot_delay: {get_param: UpgradeLeappPostRebootDelay} upgrade_leapp_post_reboot_delay: {get_param: UpgradeLeappPostRebootDelay}

View File

@ -40,6 +40,8 @@ parameters:
module[mandatory], stream[mandatory] and profile[optional]. If the profile module[mandatory], stream[mandatory] and profile[optional]. If the profile
is not specified 'common' will be used instead. is not specified 'common' will be used instead.
type: json type: json
tags:
- role_specific
outputs: outputs:
role_data: role_data:

View File

@ -139,6 +139,8 @@ parameters:
Command or script snippet to run on all overcloud nodes to Command or script snippet to run on all overcloud nodes to
initialize the upgrade process. E.g. a repository switch. initialize the upgrade process. E.g. a repository switch.
default: '' default: ''
tags:
- role_specific
UpgradeInitCommonCommand: UpgradeInitCommonCommand:
type: string type: string
description: | description: |

View File

@ -0,0 +1,6 @@
---
other:
- |
These parameters can now be set per-role - DnfStreams, UpgradeInitCommand,
UpgradeLeappCommandOptions, UpgradeLeappDevelSkip, UpgradeLeappToRemove,
UpgradeLeappToInstall