From 8b1fd71d209f37005d7858768d211ee1cb07a30c Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 27 May 2024 12:49:04 +0200 Subject: [PATCH 48/49] BZ#2283067 - don't remove Tomcat during Satellite 7to8 upgrade This was previously added to workaround issues with the packages in RHEL 8.8/8.9, but now that 8.10 is released it's not required anymore and actually breaks the upgrade. --- .../actors/satellite_upgrade_facts/actor.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py index 3cd9d9da..cfba0503 100644 --- a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py +++ b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py @@ -1,7 +1,7 @@ import os from leapp.actors import Actor -from leapp.libraries.common.config import architecture +from leapp.libraries.common.config import architecture, version from leapp.libraries.common.rpms import has_package from leapp.libraries.stdlib import run from leapp.models import ( @@ -55,11 +55,12 @@ class SatelliteUpgradeFacts(Actor): # enable modules that are needed for Pulpcore modules_to_enable.append(Module(name='python38', stream='3.8')) to_install.append('katello') - # Force removal of tomcat - # PES data indicates tomcat.el7 can be upgraded to tomcat.el8 since EL 8.8, - # but we need pki-servlet-engine from the module instead which will be pulled in via normal - # package dependencies - to_remove.extend(['tomcat', 'tomcat-lib']) + if version.matches_target_version('8.8', '8.9'): + # Force removal of tomcat + # PES data indicates tomcat.el7 can be upgraded to tomcat.el8 since EL 8.8, + # but we need pki-servlet-engine from the module instead which will be pulled in via normal + # package dependencies + to_remove.extend(['tomcat', 'tomcat-lib']) if has_package(InstalledRPM, 'rh-redis5-redis'): modules_to_enable.append(Module(name='redis', stream='5')) -- 2.44.0