Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BZ#2283067 - don't remove Tomcat during Satellite 7to8 upgrade #1243

Merged
merged 1 commit into from
May 28, 2024
Merged

BZ#2283067 - don't remove Tomcat during Satellite 7to8 upgrade #1243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down Expand Up @@ -55,11 +55,12 @@ 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 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'))
Expand Down