Clean up 13>16 upgrade stuff
* 8.4 kernel doesn't have floppy and pata_acpi drivers so we don't need to remove them. These drivers were specific for RHEL7>8 upgrade (13>16 ffu) * We don't need to remove/install openvswitch as it was specific to 13>16 ffu. 17.1 comes with different version of openswitch * libibverbs is a mellanox case for 13>16 upgrade * Add irb package into to_remove. Leapp projected added irb per (#2030627). * remove_pam_pkcs11_module_check and authselect_check are specific for RHEL7>8 upgrade and don't have any effect in RHEL8>9 https://github.com/oamg/leapp-repository/blob/master/repos/system_upgrade/el7toel8/actors/authselectcheck/actor.py https://github.com/oamg/leapp-repository/blob/master/repos/system_upgrade/el7toel8/actors/removeoldpammodulescheck/actor.py Related-Bug: rhbz#2196288 Change-Id: Ic6e025e65ec81f96f8b0531a3d51b4569cf5bcc1
This commit is contained in:
parent
1ecdc0f98f
commit
871e825642
deployment/tripleo-packages
environments/lifecycle
@ -85,7 +85,7 @@ parameters:
|
||||
- role_specific
|
||||
LeappUnloadKernelDrivers:
|
||||
type: comma_delimited_list
|
||||
default: ['floppy', 'pata_acpi']
|
||||
default: []
|
||||
description: |
|
||||
List of modules to unload from the system due to being incompatible
|
||||
with the next RHEL version. If not being unloaded Leapp will
|
||||
@ -329,10 +329,7 @@ outputs:
|
||||
loop: "{{ actors_to_remove }}"
|
||||
- name: set leapp required answers
|
||||
shell: |
|
||||
# PAM module pam_pkcs11 is no longer available in RHEL-8 since it was replaced by SSSD
|
||||
leapp answer --section remove_pam_pkcs11_module_check.confirm=True --add
|
||||
# Required for TLS-Everywhere, switch from authconfig to authselect
|
||||
leapp answer --section authselect_check.confirm=True --add
|
||||
leapp answer --add --section check_vdo.confirm=True
|
||||
- name: WA for /boot/grub2/grubenv
|
||||
when: upgrade_leapp_enabled
|
||||
block:
|
||||
@ -482,11 +479,6 @@ outputs:
|
||||
when:
|
||||
- step|int == 2
|
||||
- ovs_upgrade.changed|bool
|
||||
- name: Install libibverbs (https://bugs.launchpad.net/tripleo/+bug/1817743)
|
||||
when: step|int == 2
|
||||
package:
|
||||
name: libibverbs
|
||||
state: installed
|
||||
- name: Check for os-net-config upgrade
|
||||
shell: "yum check-upgrade | awk '/os-net-config/{print}'"
|
||||
register: os_net_config_need_upgrade
|
||||
|
@ -13,8 +13,8 @@ parameter_defaults:
|
||||
EnablePackageInstall: true
|
||||
ServerDeletionPolicy: retain
|
||||
UpgradeLevelNovaCompute: auto
|
||||
UpgradeLeappToRemove: ['openvswitch2.11','ovn2.11']
|
||||
UpgradeLeappToInstall: ['openvswitch2.15','ovn2.15']
|
||||
UpgradeLeappToRemove: ['irb']
|
||||
UpgradeLeappToInstall: ['']
|
||||
UpgradeInitCommonCommand: |
|
||||
#!/bin/bash
|
||||
set -eu
|
||||
|
Loading…
x
Reference in New Issue
Block a user