From dcddeb3b914e216622e5b091ab78d97b7133b30e Mon Sep 17 00:00:00 2001 From: "Jesse Pretorius (odyssey4me)" Date: Wed, 9 Jun 2021 18:33:08 +0100 Subject: [PATCH] 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 --- deployed-server/deployed-server.yaml | 2 ++ .../tripleo-packages-baremetal-puppet.yaml | 16 +++++++++++++++- deployment/undercloud/undercloud-upgrade.yaml | 2 ++ puppet/role.role.j2.yaml | 2 ++ .../upgradeleapp-per-role-ad2e84e317ec1291.yaml | 6 ++++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/upgradeleapp-per-role-ad2e84e317ec1291.yaml diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml index 87d1b0ee58..d7f730ff49 100644 --- a/deployed-server/deployed-server.yaml +++ b/deployed-server/deployed-server.yaml @@ -48,6 +48,8 @@ parameters: Command or script snippet to run on all overcloud nodes to initialize the upgrade process. E.g. a repository switch. default: '' + tags: + - role_specific UpgradeInitCommonCommand: type: string description: | diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index a2d8e6dda4..5d57fbe724 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -45,6 +45,8 @@ parameters: development/testing. For example, LEAPP_DEVEL_SKIP_RHSM=1. type: string default: '' + tags: + - role_specific UpgradeLeappCommandOptions: description: | 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. type: string default: '' + tags: + - role_specific UpgradeLeappRebootTimeout: description: Timeout (seconds) for the OS upgrade phase via Leapp type: number @@ -66,16 +70,22 @@ parameters: default: [] description: List of packages to remove during Leapp upgrade. type: comma_delimited_list + tags: + - role_specific UpgradeLeappToInstall: default: [] description: List of packages to install after Leapp upgrade. type: comma_delimited_list + tags: + - role_specific UpgradeInitCommand: type: string description: | Command or script snippet to run on all overcloud nodes to initialize the upgrade process. E.g. a repository switch. default: '' + tags: + - role_specific UpgradeInitCommonCommand: type: string description: | @@ -101,6 +111,8 @@ parameters: module[mandatory], stream[mandatory] and profile[optional]. If the profile is not specified 'common' will be used instead. type: json + tags: + - role_specific resources: RoleParametersValue: @@ -111,6 +123,7 @@ resources: map_replace: - map_replace: - dnf_module_list: DnfStreams + upgrade_leapp_devel_skip: UpgradeLeappDevelSkip upgrade_leapp_command_options: UpgradeLeappCommandOptions upgrade_leapp_to_remove: UpgradeLeappToRemove upgrade_leapp_to_install: UpgradeLeappToInstall @@ -118,6 +131,7 @@ resources: - values: {get_param: [RoleParameters]} - values: DnfStreams: {get_param: DnfStreams} + UpgradeLeappDevelSkip: {get_param: UpgradeLeappDevelSkip} UpgradeLeappCommandOptions: {get_param: UpgradeLeappCommandOptions} UpgradeLeappToRemove: {get_param: UpgradeLeappToRemove} UpgradeLeappToInstall: {get_param: UpgradeLeappToInstall} @@ -152,7 +166,7 @@ outputs: ansible_facts['distribution'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('7', '==') }} 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_reboot_timeout: {get_param: UpgradeLeappRebootTimeout} upgrade_leapp_post_reboot_delay: {get_param: UpgradeLeappPostRebootDelay} diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml index f9bad36887..a9610f9611 100644 --- a/deployment/undercloud/undercloud-upgrade.yaml +++ b/deployment/undercloud/undercloud-upgrade.yaml @@ -40,6 +40,8 @@ parameters: module[mandatory], stream[mandatory] and profile[optional]. If the profile is not specified 'common' will be used instead. type: json + tags: + - role_specific outputs: role_data: diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 7a15f5c21f..c9d907080a 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -139,6 +139,8 @@ parameters: Command or script snippet to run on all overcloud nodes to initialize the upgrade process. E.g. a repository switch. default: '' + tags: + - role_specific UpgradeInitCommonCommand: type: string description: | diff --git a/releasenotes/notes/upgradeleapp-per-role-ad2e84e317ec1291.yaml b/releasenotes/notes/upgradeleapp-per-role-ad2e84e317ec1291.yaml new file mode 100644 index 0000000000..9deb77ca5f --- /dev/null +++ b/releasenotes/notes/upgradeleapp-per-role-ad2e84e317ec1291.yaml @@ -0,0 +1,6 @@ +--- +other: + - | + These parameters can now be set per-role - DnfStreams, UpgradeInitCommand, + UpgradeLeappCommandOptions, UpgradeLeappDevelSkip, UpgradeLeappToRemove, + UpgradeLeappToInstall