forked from rpms/leapp-repository
148 lines
8.9 KiB
Diff
148 lines
8.9 KiB
Diff
From 37409349656c12efd4033e0cb5a3c25d10e6630d Mon Sep 17 00:00:00 2001
|
||
From: Mark Huth <mhuth@redhat.com>
|
||
Date: Mon, 15 Sep 2025 16:29:02 +1000
|
||
Subject: [PATCH 27/55] chore(RHINENG-19596): Rebrand Insights to Lightspeed
|
||
|
||
---
|
||
commands/preupgrade/__init__.py | 2 +-
|
||
commands/upgrade/__init__.py | 2 +-
|
||
docs/source/configuring-ipu/envars.md | 2 +-
|
||
.../common/actors/checkinsightsautoregister/actor.py | 2 +-
|
||
.../libraries/checkinsightsautoregister.py | 5 +++--
|
||
.../common/actors/insightsautoregister/actor.py | 2 +-
|
||
.../insightsautoregister/libraries/insightsautoregister.py | 6 +++---
|
||
.../insightsautoregister/tests/test_insightsautoregister.py | 2 +-
|
||
8 files changed, 12 insertions(+), 11 deletions(-)
|
||
|
||
diff --git a/commands/preupgrade/__init__.py b/commands/preupgrade/__init__.py
|
||
index 6443bd8a..f24e779a 100644
|
||
--- a/commands/preupgrade/__init__.py
|
||
+++ b/commands/preupgrade/__init__.py
|
||
@@ -26,7 +26,7 @@ from leapp.utils.output import beautify_actor_exception, report_errors, report_i
|
||
help='Use only custom repositories and skip actions with Red Hat Subscription Manager.'
|
||
' This only has effect on Red Hat Enterprise Linux systems.'
|
||
)
|
||
-@command_opt('no-insights-register', is_flag=True, help='Do not register into Red Hat Insights')
|
||
+@command_opt('no-insights-register', is_flag=True, help='Do not register into Red Hat Lightspeed')
|
||
@command_opt('no-rhsm-facts', is_flag=True, help='Do not store migration information using Red Hat '
|
||
'Subscription Manager. Automatically implied by --no-rhsm.')
|
||
@command_opt('enablerepo', action='append', metavar='<repoid>',
|
||
diff --git a/commands/upgrade/__init__.py b/commands/upgrade/__init__.py
|
||
index 36be0719..c5900c0d 100644
|
||
--- a/commands/upgrade/__init__.py
|
||
+++ b/commands/upgrade/__init__.py
|
||
@@ -32,7 +32,7 @@ from leapp.utils.output import beautify_actor_exception, report_errors, report_i
|
||
help='Use only custom repositories and skip actions with Red Hat Subscription Manager.'
|
||
' This only has effect on Red Hat Enterprise Linux systems.'
|
||
)
|
||
-@command_opt('no-insights-register', is_flag=True, help='Do not register into Red Hat Insights')
|
||
+@command_opt('no-insights-register', is_flag=True, help='Do not register into Red Hat Lightspeed')
|
||
@command_opt('no-rhsm-facts', is_flag=True, help='Do not store migration information using Red Hat '
|
||
'Subscription Manager. Automatically implied by --no-rhsm.')
|
||
@command_opt('enablerepo', action='append', metavar='<repoid>',
|
||
diff --git a/docs/source/configuring-ipu/envars.md b/docs/source/configuring-ipu/envars.md
|
||
index a042ba4a..09634df2 100644
|
||
--- a/docs/source/configuring-ipu/envars.md
|
||
+++ b/docs/source/configuring-ipu/envars.md
|
||
@@ -21,7 +21,7 @@ Overrides the automatically detected storage device with GRUB core (e.g. /dev/sd
|
||
Set to 1 to disable RPM GPG checks (same as yum/dnf –nogpgckeck option). It‘s equivalent to the --nogpgcheck leapp option.
|
||
|
||
#### LEAPP_NO_INSIGHTS_REGISTER
|
||
-If set to `1`, Leapp does not register the system into Red Hat Insights automatically. It‘s equivalent to the --no-insights-register leapp option.
|
||
+If set to `1`, Leapp does not register the system into Red Hat Lightspeed automatically. It‘s equivalent to the --no-insights-register leapp option.
|
||
|
||
#### LEAPP_NO_NETWORK_RENAMING
|
||
If set to `1`, the actor responsible to handle NICs names ends without doing anything. The actor usually creates UDEV rules to preserve original NICs in case they are changed. However, in some cases it‘s not wanted and it leads in malfunction network configuration (e.g. in case the bonding is configured on the system). It‘s expected that NICs have to be handled manually if needed.
|
||
diff --git a/repos/system_upgrade/common/actors/checkinsightsautoregister/actor.py b/repos/system_upgrade/common/actors/checkinsightsautoregister/actor.py
|
||
index 70b3b670..52108566 100644
|
||
--- a/repos/system_upgrade/common/actors/checkinsightsautoregister/actor.py
|
||
+++ b/repos/system_upgrade/common/actors/checkinsightsautoregister/actor.py
|
||
@@ -7,7 +7,7 @@ from leapp.tags import ChecksPhaseTag, IPUWorkflowTag
|
||
|
||
class CheckInsightsAutoregister(Actor):
|
||
"""
|
||
- Checks if system can be automatically registered into Red Hat Insights
|
||
+ Checks if system can be automatically registered into Red Hat Lightspeed
|
||
|
||
The registration is skipped if NO_INSIGHTS_REGISTER=1 environment variable
|
||
is set, the --no-insights-register command line argument present. if the
|
||
diff --git a/repos/system_upgrade/common/actors/checkinsightsautoregister/libraries/checkinsightsautoregister.py b/repos/system_upgrade/common/actors/checkinsightsautoregister/libraries/checkinsightsautoregister.py
|
||
index 762f3c08..8e26485b 100644
|
||
--- a/repos/system_upgrade/common/actors/checkinsightsautoregister/libraries/checkinsightsautoregister.py
|
||
+++ b/repos/system_upgrade/common/actors/checkinsightsautoregister/libraries/checkinsightsautoregister.py
|
||
@@ -24,9 +24,9 @@ def _ensure_package(package):
|
||
def _report_registration_info(installing_client):
|
||
pkg_msg = " The '{}' package required for the registration will be installed during the upgrade."
|
||
|
||
- title = "Automatic registration into Red Hat Insights"
|
||
+ title = "Automatic registration into Red Hat Lightspeed"
|
||
summary = (
|
||
- "After the upgrade, this system will be automatically registered into Red Hat Insights."
|
||
+ "After the upgrade, this system will be automatically registered into Red Hat Lightspeed."
|
||
"{}"
|
||
" To skip the automatic registration, use the '--no-insights-register' command line option or"
|
||
" set the LEAPP_NO_INSIGHTS_REGISTER environment variable."
|
||
@@ -38,6 +38,7 @@ def _report_registration_info(installing_client):
|
||
reporting.Summary(summary),
|
||
reporting.Severity(reporting.Severity.INFO),
|
||
reporting.Groups([reporting.Groups.SERVICES]),
|
||
+ reporting.Key('693963253195f418526f045b6d630a1f4c7a193d'),
|
||
]
|
||
)
|
||
|
||
diff --git a/repos/system_upgrade/common/actors/insightsautoregister/actor.py b/repos/system_upgrade/common/actors/insightsautoregister/actor.py
|
||
index a81b434c..56615390 100644
|
||
--- a/repos/system_upgrade/common/actors/insightsautoregister/actor.py
|
||
+++ b/repos/system_upgrade/common/actors/insightsautoregister/actor.py
|
||
@@ -7,7 +7,7 @@ from leapp.tags import FirstBootPhaseTag, IPUWorkflowTag
|
||
|
||
class InsightsAutoregister(Actor):
|
||
"""
|
||
- Automatically registers system into Red Hat Insights
|
||
+ Automatically registers system into Red Hat Lightspeed
|
||
|
||
The registration is skipped if NO_INSIGHTS_REGISTER=1 environment variable
|
||
is set, the --no-insights-register command line argument present or the
|
||
diff --git a/repos/system_upgrade/common/actors/insightsautoregister/libraries/insightsautoregister.py b/repos/system_upgrade/common/actors/insightsautoregister/libraries/insightsautoregister.py
|
||
index 2134a8bb..bd113a1f 100644
|
||
--- a/repos/system_upgrade/common/actors/insightsautoregister/libraries/insightsautoregister.py
|
||
+++ b/repos/system_upgrade/common/actors/insightsautoregister/libraries/insightsautoregister.py
|
||
@@ -6,18 +6,18 @@ from leapp.libraries.stdlib import api, CalledProcessError, run
|
||
def _insights_register():
|
||
try:
|
||
run(['insights-client', '--register'])
|
||
- api.current_logger().info('Automatically registered into Red Hat Insights')
|
||
+ api.current_logger().info('Automatically registered into Red Hat Lightspeed')
|
||
except (CalledProcessError) as err:
|
||
# TODO(mmatuska) produce post-upgrade report?
|
||
api.current_logger().error(
|
||
- 'Automatic registration into Red Hat Insights failed: {}'.format(err)
|
||
+ 'Automatic registration into Red Hat Lightspeed failed: {}'.format(err)
|
||
)
|
||
|
||
|
||
def process():
|
||
if rhsm.skip_rhsm() or get_env('LEAPP_NO_INSIGHTS_REGISTER', '0') == '1':
|
||
api.current_logger().debug(
|
||
- 'Skipping registration into Insights due to --no-insights-register'
|
||
+ 'Skipping registration into Red Hat Lightspeed due to --no-insights-register'
|
||
' or LEAPP_NO_INSIGHTS_REGISTER=1 set'
|
||
)
|
||
return
|
||
diff --git a/repos/system_upgrade/common/actors/insightsautoregister/tests/test_insightsautoregister.py b/repos/system_upgrade/common/actors/insightsautoregister/tests/test_insightsautoregister.py
|
||
index 0a039455..d5e6ba20 100644
|
||
--- a/repos/system_upgrade/common/actors/insightsautoregister/tests/test_insightsautoregister.py
|
||
+++ b/repos/system_upgrade/common/actors/insightsautoregister/tests/test_insightsautoregister.py
|
||
@@ -41,7 +41,7 @@ def test_insights_register_success_logged(monkeypatch):
|
||
|
||
def run_mocked(cmd, **kwargs):
|
||
return {
|
||
- 'stdout': 'Successfully registered into Insights',
|
||
+ 'stdout': 'Successfully registered into Red Hat Lightspeed',
|
||
'stderr': '',
|
||
'exit_code': 0
|
||
}
|
||
--
|
||
2.51.1
|
||
|