代码拉取完成，页面将自动刷新
Fork 仓库
加载中
确定同步？
同步操作将从 anolis/leapp 强制同步，此操作会覆盖自 Fork 仓库以来所做的任何修改，且无法恢复！！！
确定后同步将在后台操作，完成时将刷新页面，请耐心等待。
0024-remove-unofficial-url.patch
22.30 KB
Meredith
提交于
2022-01-25 23:23
.
fix kernel version check of anolis kernel
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382
From a01daee6765b0568eb16f3559a6d63afa2285a8a Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@linux.alibaba.com>
Date: Tue, 25 Jan 2022 19:50:36 +0800
Subject: [PATCH] remove unofficial url
Signed-off-by: Chunmei Xu <xuchunmei@linux.alibaba.com>
---
.../el7toel8/actors/checkbtrfs/actor.py | 4 ----
.../el7toel8/actors/checkcpu/libraries/cpu.py | 4 ----
.../checkhacluster/libraries/checkhacluster.py | 7 -------
.../checkipaserver/libraries/checkipaserver.py | 16 +---------------
.../el7toel8/actors/checkmemory/actor.py | 1 -
.../checksaphana/libraries/checksaphana.py | 6 +-----
.../libraries/checktargetrepos.py | 6 +-----
.../actors/kernel/checkkerneldrivers/actor.py | 4 +---
.../el7toel8/actors/localreposinhibit/actor.py | 13 +------------
.../actors/persistentnetnamesdisable/actor.py | 2 +-
.../libraries/peseventsscanner.py | 3 +--
.../el7toel8/actors/pythoninformuser/actor.py | 5 +----
.../el7toel8/actors/quaggareport/actor.py | 6 ------
.../libraries/repositoriesblacklist.py | 10 +---------
.../libraries/repositoriesmapping.py | 4 +---
.../el7toel8/actors/tcpwrapperscheck/actor.py | 5 +----
.../libraries/vsftpdconfigcheck.py | 5 +----
17 files changed, 12 insertions(+), 89 deletions(-)
diff --git a/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py b/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py
index 6f6941d..74e431f 100644
--- a/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py
@@ -29,10 +29,6 @@ class CheckBtrfs(Actor):
'initial release of Red Hat Enterprise Linux 6 and Red Hat Enterprise Linux 7. As of '
'versions 6.6 and 7.4 this technology has been deprecated and removed in Anolis8.'
),
- reporting.ExternalLink(
- title='Considerations in adopting Anolis 8 - btrfs has been removed.',
- url='https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/considerations_in_adopting_rhel_8/file-systems-and-storage_considerations-in-adopting-rhel-8#btrfs-has-been-removed_file-systems-and-storage' # noqa: E501; pylint: disable=line-too-long
- ),
reporting.Severity(reporting.Severity.HIGH),
reporting.Flags([reporting.Flags.INHIBITOR]),
reporting.Tags([reporting.Tags.FILESYSTEM]),
diff --git a/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py b/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py
index 3fc9c48..619a4e0 100644
--- a/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py
+++ b/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py
@@ -32,9 +32,5 @@ def process():
reporting.Severity(reporting.Severity.HIGH),
reporting.Tags([reporting.Tags.SANITY]),
reporting.Flags([reporting.Flags.INHIBITOR]),
- reporting.ExternalLink(
- title="Considerations in adopting Anolis 8",
- url=("https://access.redhat.com/ecosystem/hardware/#/search?p=1&"
- "c_version=Red%20Hat%20Enterprise%20Linux%208&ch_architecture=s390x"))
]
reporting.create_report(report)
diff --git a/repos/system_upgrade/el7toel8/actors/checkhacluster/libraries/checkhacluster.py b/repos/system_upgrade/el7toel8/actors/checkhacluster/libraries/checkhacluster.py
index dd3e1c8..73511c3 100644
--- a/repos/system_upgrade/el7toel8/actors/checkhacluster/libraries/checkhacluster.py
+++ b/repos/system_upgrade/el7toel8/actors/checkhacluster/libraries/checkhacluster.py
@@ -18,13 +18,6 @@ def inhibit(node_type):
reporting.Severity(reporting.Severity.HIGH),
reporting.Tags([reporting.Tags.HIGH_AVAILABILITY]),
reporting.Flags([reporting.Flags.INHIBITOR]),
- reporting.ExternalLink(
- url="https://access.redhat.com/articles/2059253",
- title=(
- "Recommended Practices for Applying Software Updates"
- " to a RHEL High Availability or Resilient Storage Cluster"
- ),
- ),
reporting.Remediation(
hint=(
"Destroy the existing HA cluster"
diff --git a/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py b/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py
index b5dff87..2f107c4 100644
--- a/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py
+++ b/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py
@@ -1,9 +1,5 @@
from leapp import reporting
-MIGRATION_GUIDE = (
- "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux"
- "/8/html/installing_identity_management/migrate-7-to-8_migrating"
-)
def ipa_inhibit_upgrade(ipainfo):
@@ -16,14 +12,7 @@ def ipa_inhibit_upgrade(ipainfo):
),
reporting.Summary(
"An IdM server installation was detected on the system. IdM "
- "does not support in-place upgrade to Anolis 8. Please follow "
- "the migration guide lines."
- ),
- reporting.Remediation(
- hint="Please follow the IdM RHEL 7 to 8 migration guide lines."
- ),
- reporting.ExternalLink(
- url=MIGRATION_GUIDE, title="Migrating IdM from RHEL 7 to 8",
+ "does not support in-place upgrade to Anolis 8."
),
reporting.Severity(reporting.Severity.HIGH),
reporting.Flags([reporting.Flags.INHIBITOR]),
@@ -56,9 +45,6 @@ def ipa_warn_pkg_installed(ipainfo):
hint="Remove unused ipa-server package",
commands=[["yum", "remove", "-y", "ipa-server"]],
),
- reporting.ExternalLink(
- url=MIGRATION_GUIDE, title="Migrating IdM from RHEL 7 to 8",
- ),
reporting.Severity(reporting.Severity.MEDIUM),
reporting.Tags([reporting.Tags.SERVICES]),
reporting.RelatedResource("package", "ipa-server"),
diff --git a/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py b/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py
index b26ae6d..9852721 100644
--- a/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py
@@ -8,7 +8,6 @@ class CheckMemory(Actor):
"""
The actor check the size of RAM against Anolis8 minimal hardware requirements
- Using the following resource: https://access.redhat.com/articles/rhel-limits
"""
name = 'checkmemory'
diff --git a/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py b/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py
index 5e9625b..00166c9 100644
--- a/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py
+++ b/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py
@@ -177,16 +177,12 @@ def platform_check():
reporting.create_report([
reporting.Title('SAP HANA upgrades are only supported on X86_64 systems'),
reporting.Summary(
- ('Upgrades for SAP HANA are only supported on X86_64 systems.'
- ' For more information please consult the documentation.')
+ ('Upgrades for SAP HANA are only supported on X86_64 systems.')
),
reporting.Severity(reporting.Severity.HIGH),
reporting.Tags([reporting.Tags.SANITY]),
reporting.Flags([reporting.Flags.INHIBITOR]),
reporting.Audience('sysadmin'),
- reporting.ExternalLink(
- url='https://access.redhat.com/solutions/5533441',
- title='How do I upgrade from Red Hat Enterprise Linux 7 to Red Hat Enterprise Linux 8 with SAP HANA')
])
return False
diff --git a/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py b/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py
index 277f4f8..dbc3e8c 100644
--- a/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py
+++ b/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py
@@ -4,8 +4,6 @@ from leapp import reporting
from leapp.libraries.common import config, rhsm
-_IPU_DOC_URL = ('https://access.redhat.com/documentation/en-us/'
- 'red_hat_enterprise_linux/8/html-single/upgrading_to_rhel_8/index')
# TODO: we need to provide this path in a shared library
CUSTOM_REPO_PATH = '/etc/leapp/files/leapp_upgrade_repositories.repo'
@@ -72,7 +70,6 @@ def process():
reporting.Severity(reporting.Severity.HIGH),
reporting.Tags([reporting.Tags.SANITY]),
reporting.Flags([reporting.Flags.INHIBITOR]),
- reporting.ExternalLink(url=_IPU_DOC_URL, title='UPGRADING TO ANOLIS 8'),
reporting.RelatedResource('file', CUSTOM_REPO_PATH),
])
elif not (is_ctrf or is_re):
@@ -82,7 +79,7 @@ def process():
reporting.create_report([
reporting.Title('Detected "CustomTargetRepositories" without using new provided mechanisms used.'),
reporting.Summary(
- 'Red Hat now provides an official way for using custom'
+ 'Anolis OS now provides an official way for using custom'
' repositories during the in-place upgrade through'
' the referred custom repository file or through the'
' --enablerepo option for leapp. The CustomTargetRepositories'
@@ -95,6 +92,5 @@ def process():
' message.'
)),
reporting.Severity(reporting.Severity.INFO),
- reporting.ExternalLink(url=_IPU_DOC_URL, title='UPGRADING TO ANOLIS 8'),
reporting.RelatedResource('file', CUSTOM_REPO_PATH),
])
diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py
index 99bdd98..e1ce303 100644
--- a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py
@@ -34,11 +34,9 @@ class CheckKernelDrivers(Actor):
if conflicting:
title = ('Detected loaded kernel drivers which have been removed '
'in Anolis 8. Upgrade cannot proceed.')
- URL = ('https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/'
- 'considerations_in_adopting_rhel_8/index#removed-device-drivers_hardware-enablement')
summary = ('Support for the following Anolis 7 '
'device drivers has been removed in Anolis 8: \n - {}'
- '\nPlease see {} for details.'.format('\n - '.join(conflicting), URL))
+ '\n'.format('\n - '.join(conflicting)))
remediation = ('Please disable detected kernel drivers in '
'order to proceed with the upgrade process using the rmmod or modprobe -r.')
create_report([
diff --git a/repos/system_upgrade/el7toel8/actors/localreposinhibit/actor.py b/repos/system_upgrade/el7toel8/actors/localreposinhibit/actor.py
index 149783b..6309d59 100644
--- a/repos/system_upgrade/el7toel8/actors/localreposinhibit/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/localreposinhibit/actor.py
@@ -53,19 +53,8 @@ class LocalReposInhibit(Actor):
reporting.Remediation(
hint=(
"By using Apache HTTP Server you can expose "
- "your local repository via http. See the linked "
- "article for details. "
+ "your local repository via http."
)
),
- reporting.ExternalLink(
- title=(
- "Customizing your Red Hat Enterprise Linux "
- "in-place upgrade"
- ),
- url=(
- "https://access.redhat.com/articles/4977891/"
- "#repos-known-issues"
- ),
- ),
]
)
diff --git a/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py b/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py
index 4e512c1..154ab9d 100644
--- a/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py
@@ -44,7 +44,7 @@ class PersistentNetNamesDisable(Actor):
reporting.Summary(
'Detected multiple network interfaces using unstable kernel names (e.g. eth0, eth1). '
'Upgrade process can not continue because stability of names can not be guaranteed. '
- 'Please read the article at https://access.redhat.com/solutions/4067471 for more information.'
+ 'Please read the solution in migration guide and https://www.yuque.com/anolis-docs/kbase/.'
),
reporting.Severity(reporting.Severity.HIGH),
reporting.Tags([reporting.Tags.NETWORK]),
diff --git a/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py b/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py
index 455bbd4..4d955a0 100644
--- a/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py
+++ b/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py
@@ -138,8 +138,7 @@ def get_events(pes_events_filepath):
return parse_pes_events_file(pes_events_filepath)
except (ValueError, KeyError):
title = 'Missing/Invalid PES data file ({})'.format(pes_events_filepath)
- summary = 'Read documentation at: https://access.redhat.com/articles/3664871 for more information ' \
- 'about how to retrieve the files'
+ summary = 'Please contact migration owner for help.'
reporting.create_report([
reporting.Title(title),
reporting.Summary(summary),
diff --git a/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py b/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py
index a64e00a..4455b04 100644
--- a/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py
@@ -12,19 +12,16 @@ class PythonInformUser(Actor):
tags = (ChecksPhaseTag, IPUWorkflowTag)
def process(self):
- url = "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/configuring_basic_system_settings/#using-python3" # noqa: E501; pylint: disable=line-too-long
title = "Difference in Python versions and support in Anolis 8"
summary = ("In Anolis 8, there is no 'python' command."
" Python 3 (backward incompatible) is the primary Python version"
- " and Python 2 is available with limited support and limited set of packages."
- " Read more here: {}".format(url))
+ " and Python 2 is available with limited support and limited set of packages.")
create_report([
reporting.Title(title),
reporting.Summary(summary),
reporting.Severity(reporting.Severity.HIGH),
reporting.Tags([reporting.Tags.PYTHON]),
reporting.Audience('developer'),
- reporting.ExternalLink(url, title),
reporting.Remediation(hint='Please run "alternatives --set python /usr/bin/python3" after upgrade'),
reporting.RelatedResource('package', 'python'),
reporting.RelatedResource('package', 'python2'),
diff --git a/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py b/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py
index 3b930cf..9645a0f 100644
--- a/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py
@@ -31,12 +31,6 @@ class QuaggaReport(Actor):
if 'babeld' in quagga_facts.active_daemons or 'babeld' in quagga_facts.enabled_daemons:
create_report([
reporting.Title('Babeld is not available in FRR'),
- reporting.ExternalLink(
- url='https://access.redhat.com/'
- 'documentation/en-us/red_hat_enterprise_linux/8/html/'
- 'configuring_and_managing_networking/setting-your-rou'
- 'ting-protocols_configuring-and-managing-networking',
- title='Setting routing protocols in Anolis8'),
reporting.Summary(
'babeld daemon which was a part of quagga implementation in RHEL7 '
'is not available in Anolis8 in FRR due to licensing issues.'
diff --git a/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py b/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py
index ec4949c..a0fee13 100644
--- a/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py
+++ b/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py
@@ -57,7 +57,7 @@ def process():
reporting.Title("Excluded Anolis 8 repositories"),
reporting.Summary(
"The following repositories are not supported by "
- "Red Hat and are excluded from the list of repositories "
+ "Anolis OS and are excluded from the list of repositories "
"used during the upgrade.\n- {}".format(
"\n- ".join(reposid_blacklist)
)
@@ -65,13 +65,5 @@ def process():
reporting.Severity(reporting.Severity.INFO),
reporting.Tags([reporting.Tags.REPOSITORY]),
reporting.Flags([reporting.Flags.FAILURE]),
- reporting.ExternalLink(
- url=(
- "https://access.redhat.com/documentation/en-us/"
- "red_hat_enterprise_linux/8/html/package_manifest/"
- "codereadylinuxbuilder-repository."
- ),
- title="CodeReady Linux Builder repository",
- ),
]
reporting.create_report(report)
diff --git a/repos/system_upgrade/el7toel8/actors/repositoriesmapping/libraries/repositoriesmapping.py b/repos/system_upgrade/el7toel8/actors/repositoriesmapping/libraries/repositoriesmapping.py
index f1c8323..83f230f 100644
--- a/repos/system_upgrade/el7toel8/actors/repositoriesmapping/libraries/repositoriesmapping.py
+++ b/repos/system_upgrade/el7toel8/actors/repositoriesmapping/libraries/repositoriesmapping.py
@@ -13,9 +13,7 @@ REPOMAP_FILE = '/etc/leapp/files/repomap.csv'
def _inhibit_upgrade(msg):
raise StopActorExecutionError(
msg,
- details={'hint': ('Read documentation at the following link for more'
- ' information about how to retrieve the valid file:'
- ' https://access.redhat.com/articles/3664871')})
+ details={'hint': ('Contact migration owner to get valid files.')})
def _read_repofile(path):
diff --git a/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py b/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py
index d7d7331..7d863df 100644
--- a/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py
+++ b/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py
@@ -66,13 +66,10 @@ class TcpWrappersCheck(Actor):
'There is some configuration affecting installed packages (namely {}) '
'in /etc/hosts.deny or /etc/hosts.allow, which '
'is no longer going to be effective after update. '
+ 'Firewalld can be used as a firewall level replacement for TCP Wrappers.'
'Please migrate it manually.'.format(', '.join(found_packages))
),
reporting.Severity(reporting.Severity.HIGH),
- reporting.ExternalLink(
- title='Replacing TCP Wrappers in Anolis 8',
- url='https://access.redhat.com/solutions/3906701'
- ),
reporting.Tags([reporting.Tags.SECURITY, reporting.Tags.NETWORK]),
reporting.Flags([reporting.Flags.INHIBITOR]),
reporting.RelatedResource('file', '/etc/hosts.allow'),
diff --git a/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py b/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py
index a6c307c..b761897 100644
--- a/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py
+++ b/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py
@@ -14,6 +14,7 @@ def check_config_supported(tcpwrap_facts, vsftpd_facts):
'Some configuration files set the tcp_wrappers option to true and '
'there is some vsftpd-related configuration in /etc/hosts.deny '
'or /etc/hosts.allow. Please migrate it manually. '
+ 'Firewalld can be used as a firewall level replacement for TCP Wrappers.'
'The list of problematic configuration files:{}{}'.
format(
list_separator_fmt,
@@ -23,10 +24,6 @@ def check_config_supported(tcpwrap_facts, vsftpd_facts):
reporting.Severity(reporting.Severity.HIGH),
reporting.Tags([reporting.Tags.SERVICES, reporting.Tags.NETWORK]),
reporting.Flags([reporting.Flags.INHIBITOR]),
- reporting.ExternalLink(
- title='Replacing TCP Wrappers in Anolis 8',
- url='https://access.redhat.com/solutions/3906701'
- ),
reporting.RelatedResource('package', 'tcp_wrappers'),
reporting.RelatedResource('package', 'vsftpd'),
] + [reporting.RelatedResource('file', str(bc)) for bc in bad_configs])
--
2.19.1.6.gb485710b
Loading...
举报
请认真填写举报原因，尽可能描述详细。
请选择举报类型
误判申诉
此处可能存在不合适展示的内容，页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容，可点击提交进行申诉，我们将尽快为您处理。
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化