diff --git a/repos/system_upgrade/common/actors/satellite_upgrader/actor.py b/repos/system_upgrade/common/actors/satellite_upgrader/actor.py index f498f2faea..8f0aeffacd 100644 --- a/repos/system_upgrade/common/actors/satellite_upgrader/actor.py +++ b/repos/system_upgrade/common/actors/satellite_upgrader/actor.py @@ -29,7 +29,7 @@ def process(self): api.current_logger().error('Failed to reindex the database: {}'.format(str(e))) installer_cmd = ['foreman-installer'] - if facts.has_katello_installer: + if facts.installer_has_systemchecks: installer_cmd.append('--disable-system-checks') api.current_actor().show_message('Running the installer. This can take a while.') diff --git a/repos/system_upgrade/common/actors/satellite_upgrader/tests/unit_test_satellite_upgrader.py b/repos/system_upgrade/common/actors/satellite_upgrader/tests/unit_test_satellite_upgrader.py index 2f3509f324..5fe3b43b84 100644 --- a/repos/system_upgrade/common/actors/satellite_upgrader/tests/unit_test_satellite_upgrader.py +++ b/repos/system_upgrade/common/actors/satellite_upgrader/tests/unit_test_satellite_upgrader.py @@ -28,7 +28,7 @@ def test_run_installer(monkeypatch, current_actor_context): def test_run_installer_without_katello(monkeypatch, current_actor_context): mocked_run = MockedRun() monkeypatch.setattr('leapp.libraries.stdlib.run', mocked_run) - current_actor_context.feed(SatelliteFacts(has_foreman=True, has_katello_installer=False, + current_actor_context.feed(SatelliteFacts(has_foreman=True, installer_has_systemchecks=False, postgresql=SatellitePostgresqlFacts(local_postgresql=False))) current_actor_context.run() assert mocked_run.commands diff --git a/repos/system_upgrade/common/models/satellite.py b/repos/system_upgrade/common/models/satellite.py index b4282790bf..3af0b5e7d7 100644 --- a/repos/system_upgrade/common/models/satellite.py +++ b/repos/system_upgrade/common/models/satellite.py @@ -22,7 +22,7 @@ class SatelliteFacts(Model): has_foreman = fields.Boolean(default=False) """Whether or not foreman is installed on this system""" - has_katello_installer = fields.Boolean(default=True) - """Whether or not the installer supports Katello additions""" + installer_has_systemchecks = fields.Boolean(default=True) + """Whether or not the installer supports --disable-system-checks flag""" postgresql = fields.Model(SatellitePostgresqlFacts) """ Foreman related PostgreSQL facts """ 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..2bbffc4838 100644 --- a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py +++ b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/actor.py @@ -36,7 +36,7 @@ def process(self): if not has_foreman: return - has_katello_installer = has_package(InstalledRPM, 'foreman-installer-katello') + installer_has_systemchecks = has_package(InstalledRPM, 'foreman-installer-katello') local_postgresql = has_package(InstalledRPM, 'rh-postgresql12-postgresql-server') postgresql_contrib = has_package(InstalledRPM, 'rh-postgresql12-postgresql-contrib') @@ -126,7 +126,7 @@ def process(self): self.produce(SatelliteFacts( has_foreman=has_foreman, - has_katello_installer=has_katello_installer, + installer_has_systemchecks=installer_has_systemchecks, postgresql=SatellitePostgresqlFacts( local_postgresql=local_postgresql, old_var_lib_pgsql_data=old_pgsql_data, diff --git a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/tests/unit_test_satellite_upgrade_facts.py b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/tests/unit_test_satellite_upgrade_facts.py index 2fb8a3ba5d..f5c39ae70e 100644 --- a/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/tests/unit_test_satellite_upgrade_facts.py +++ b/repos/system_upgrade/el7toel8/actors/satellite_upgrade_facts/tests/unit_test_satellite_upgrade_facts.py @@ -61,14 +61,14 @@ def test_no_katello_installer_present(current_actor_context): current_actor_context.feed(InstalledRPM(items=[FOREMAN_RPM])) current_actor_context.run(config_model=mock_configs.CONFIG) message = current_actor_context.consume(SatelliteFacts)[0] - assert not message.has_katello_installer + assert not message.installer_has_systemchecks def test_katello_installer_present(current_actor_context): current_actor_context.feed(InstalledRPM(items=[FOREMAN_RPM, KATELLO_INSTALLER_RPM])) current_actor_context.run(config_model=mock_configs.CONFIG) message = current_actor_context.consume(SatelliteFacts)[0] - assert message.has_katello_installer + assert message.installer_has_systemchecks def test_enables_ruby_module(current_actor_context):