From f73d551b2718026690e66c32e4a572c914f7e15f Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 27 May 2024 12:49:04 +0200 Subject: [PATCH] BZ#2283067 - don't remove Tomcat during Satellite 7to8 upgrade This was previously added to workaround issues with the packages in RHEL 8.9, but now that 8.10 is released it's not required anymore and actually breaks the upgrade. --- .../el7toel8/actors/satellite_upgrade_facts/actor.py | 5 ----- 1 file changed, 5 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 3cd9d9daaf..9bc49baa9d 100644 --- a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py +++ b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py @@ -55,11 +55,6 @@ def process(self): # 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 has_package(InstalledRPM, 'rh-redis5-redis'): modules_to_enable.append(Module(name='redis', stream='5'))