|
|
37ae37 |
diff -uNrp sos-3.9.orig/sos/policies/redhat.py sos-3.9/sos/policies/redhat.py
|
|
|
37ae37 |
--- sos-3.9.orig/sos/policies/redhat.py 2020-03-24 15:33:13.000000000 +0000
|
|
|
37ae37 |
+++ sos-3.9/sos/policies/redhat.py 2020-10-03 12:48:32.088747085 +0000
|
|
|
37ae37 |
@@ -89,7 +89,7 @@ class RedHatPolicy(LinuxPolicy):
|
|
|
37ae37 |
def check(cls):
|
|
|
37ae37 |
"""This method checks to see if we are running on Red Hat. It must be
|
|
|
37ae37 |
overriden by concrete subclasses to return True when running on a
|
|
|
37ae37 |
- Fedora, RHEL or other Red Hat distribution or False otherwise."""
|
|
|
37ae37 |
+ Fedora, CentOS, RHEL or other Red Hat distribution or False otherwise."""
|
|
|
37ae37 |
return False
|
|
|
37ae37 |
|
|
|
37ae37 |
def check_usrmove(self, pkgs):
|
|
|
37ae37 |
@@ -187,29 +187,29 @@ _opts_all_logs_verify = SoSOptions(all_l
|
|
|
37ae37 |
_cb_profiles = ['boot', 'storage', 'system']
|
|
|
37ae37 |
_cb_plugopts = ['boot.all-images=on', 'rpm.rpmva=on', 'rpm.rpmdb=on']
|
|
|
37ae37 |
|
|
|
37ae37 |
-RHEL_RELEASE_STR = "Red Hat Enterprise Linux"
|
|
|
37ae37 |
+RHEL_RELEASE_STR = "CentOS Linux"
|
|
|
37ae37 |
|
|
|
37ae37 |
RHV = "rhv"
|
|
|
37ae37 |
-RHV_DESC = "Red Hat Virtualization"
|
|
|
37ae37 |
+RHV_DESC = "Virtualization"
|
|
|
37ae37 |
|
|
|
37ae37 |
RHEL = "rhel"
|
|
|
37ae37 |
RHEL_DESC = RHEL_RELEASE_STR
|
|
|
37ae37 |
|
|
|
37ae37 |
RHOSP = "rhosp"
|
|
|
37ae37 |
-RHOSP_DESC = "Red Hat OpenStack Platform"
|
|
|
37ae37 |
+RHOSP_DESC = "OpenStack Platform"
|
|
|
37ae37 |
|
|
|
37ae37 |
RHOCP = "ocp"
|
|
|
37ae37 |
-RHOCP_DESC = "OpenShift Container Platform by Red Hat"
|
|
|
37ae37 |
+RHOCP_DESC = "OpenShift Container Platform"
|
|
|
37ae37 |
RHOSP_OPTS = SoSOptions(plugopts=[
|
|
|
37ae37 |
'process.lsof=off',
|
|
|
37ae37 |
'networking.ethtool_namespaces=False',
|
|
|
37ae37 |
'networking.namespaces=200'])
|
|
|
37ae37 |
|
|
|
37ae37 |
RH_CFME = "cfme"
|
|
|
37ae37 |
-RH_CFME_DESC = "Red Hat CloudForms"
|
|
|
37ae37 |
+RH_CFME_DESC = "CloudForms"
|
|
|
37ae37 |
|
|
|
37ae37 |
RH_SATELLITE = "satellite"
|
|
|
37ae37 |
-RH_SATELLITE_DESC = "Red Hat Satellite"
|
|
|
37ae37 |
+RH_SATELLITE_DESC = "Satellite"
|
|
|
37ae37 |
SAT_OPTS = SoSOptions(verify=True, plugopts=['apache.log=on'])
|
|
|
37ae37 |
|
|
|
37ae37 |
CB = "cantboot"
|
|
|
37ae37 |
@@ -257,8 +257,8 @@ RH_FTP_HOST = "ftp://dropbox.redhat.com"
|
|
|
37ae37 |
|
|
|
37ae37 |
class RHELPolicy(RedHatPolicy):
|
|
|
37ae37 |
distro = RHEL_RELEASE_STR
|
|
|
37ae37 |
- vendor = "Red Hat"
|
|
|
37ae37 |
- vendor_url = "https://access.redhat.com/support/"
|
|
|
37ae37 |
+ vendor = "CentOS"
|
|
|
37ae37 |
+ vendor_url = "https://wiki.centos.org/support"
|
|
|
37ae37 |
msg = _("""\
|
|
|
37ae37 |
This command will collect diagnostic and configuration \
|
|
|
37ae37 |
information from this %(distro)s system and installed \
|
|
|
37ae37 |
@@ -280,7 +280,7 @@ support representative.
|
|
|
37ae37 |
def check(cls):
|
|
|
37ae37 |
"""Test to see if the running host is a RHEL installation.
|
|
|
37ae37 |
|
|
|
37ae37 |
- Checks for the presence of the "Red Hat Enterprise Linux"
|
|
|
37ae37 |
+ Checks for the presence of the "CentOS Linux"
|
|
|
37ae37 |
release string at the beginning of the NAME field in the
|
|
|
37ae37 |
`/etc/os-release` file and returns ``True`` if it is
|
|
|
37ae37 |
found, and ``False`` otherwise.
|
|
|
37ae37 |
@@ -389,7 +389,7 @@ class CentOsPolicy(RHELPolicy):
|
|
|
37ae37 |
|
|
|
37ae37 |
ATOMIC = "atomic"
|
|
|
37ae37 |
ATOMIC_RELEASE_STR = "Atomic"
|
|
|
37ae37 |
-ATOMIC_DESC = "Red Hat Enterprise Linux Atomic Host"
|
|
|
37ae37 |
+ATOMIC_DESC = "Atomic Host"
|
|
|
37ae37 |
|
|
|
37ae37 |
atomic_presets = {
|
|
|
37ae37 |
ATOMIC: PresetDefaults(name=ATOMIC, desc=ATOMIC_DESC, note=NOTE_TIME,
|
|
|
37ae37 |
@@ -398,7 +398,7 @@ atomic_presets = {
|
|
|
37ae37 |
|
|
|
37ae37 |
|
|
|
37ae37 |
class RedHatAtomicPolicy(RHELPolicy):
|
|
|
37ae37 |
- distro = "Red Hat Atomic Host"
|
|
|
37ae37 |
+ distro = "Atomic Host"
|
|
|
37ae37 |
msg = _("""\
|
|
|
37ae37 |
This command will collect diagnostic and configuration \
|
|
|
37ae37 |
information from this %(distro)s system.
|
|
|
37ae37 |
@@ -435,7 +435,7 @@ support representative.
|
|
|
37ae37 |
|
|
|
37ae37 |
|
|
|
37ae37 |
class RedHatCoreOSPolicy(RHELPolicy):
|
|
|
37ae37 |
- distro = "Red Hat CoreOS"
|
|
|
37ae37 |
+ distro = "CoreOS"
|
|
|
37ae37 |
msg = _("""\
|
|
|
37ae37 |
This command will collect diagnostic and configuration \
|
|
|
37ae37 |
information from this %(distro)s system.
|
|
|
37ae37 |
@@ -456,7 +456,7 @@ support representative.
|
|
|
37ae37 |
host_release = os.environ[ENV_HOST_SYSROOT] + cls._redhat_release
|
|
|
37ae37 |
try:
|
|
|
37ae37 |
for line in open(host_release, 'r').read().splitlines():
|
|
|
37ae37 |
- coreos |= 'Red Hat CoreOS' in line
|
|
|
37ae37 |
+ coreos |= 'CoreOS' in line
|
|
|
37ae37 |
except IOError:
|
|
|
37ae37 |
pass
|
|
|
37ae37 |
return coreos
|
|
|
37ae37 |
diff -uNrp sos-3.9.orig/sos/policies/redhat.py sos-3.9/sos/policies/redhat.py
|
|
|
37ae37 |
--- sos-3.9.orig/sos/policies/redhat.py 2021-02-02 15:39:49.180326048 +0000
|
|
|
37ae37 |
+++ sos-3.9/sos/policies/redhat.py 2021-02-02 15:44:02.907874181 +0000
|
|
|
37ae37 |
@@ -31,9 +31,9 @@ except NameError:
|
|
|
37ae37 |
|
|
|
37ae37 |
|
|
|
37ae37 |
class RedHatPolicy(LinuxPolicy):
|
|
|
37ae37 |
- distro = "Red Hat"
|
|
|
37ae37 |
- vendor = "Red Hat"
|
|
|
37ae37 |
- vendor_url = "https://www.redhat.com/"
|
|
|
37ae37 |
+ distro = "CentOS"
|
|
|
37ae37 |
+ vendor = "CentOS"
|
|
|
37ae37 |
+ vendor_url = "https://www.centos.org/"
|
|
|
37ae37 |
_redhat_release = '/etc/redhat-release'
|
|
|
37ae37 |
_tmp_dir = "/var/tmp"
|
|
|
37ae37 |
_rpmq_cmd = 'rpm -qa --queryformat "%{NAME}|%{VERSION}|%{RELEASE}\\n"'
|
|
|
37ae37 |
@@ -87,9 +87,9 @@ class RedHatPolicy(LinuxPolicy):
|
|
|
37ae37 |
|
|
|
37ae37 |
@classmethod
|
|
|
37ae37 |
def check(cls):
|
|
|
37ae37 |
- """This method checks to see if we are running on Red Hat. It must be
|
|
|
37ae37 |
+ """This method checks to see if we are running on CentOS Linux. It must be
|
|
|
37ae37 |
overriden by concrete subclasses to return True when running on a
|
|
|
37ae37 |
- Fedora, CentOS, RHEL or other Red Hat distribution or False otherwise."""
|
|
|
37ae37 |
+ Fedora, CentOS, RHEL or other CentOS distribution or False otherwise."""
|
|
|
37ae37 |
return False
|
|
|
37ae37 |
|
|
|
37ae37 |
def check_usrmove(self, pkgs):
|
|
|
37ae37 |
diff -uNrp sos-3.9.orig/sos/policies/redhat.py sos-3.9/sos/policies/redhat.py
|
|
|
37ae37 |
--- sos-3.9.orig/sos/policies/redhat.py 2022-02-23 17:25:33.120951926 +0000
|
|
|
37ae37 |
+++ sos-3.9/sos/policies/redhat.py 2022-02-23 17:27:58.698344937 +0000
|
|
|
37ae37 |
@@ -335,7 +335,7 @@ support representative.
|
|
|
37ae37 |
|
|
|
37ae37 |
def get_upload_url_string(self):
|
|
|
37ae37 |
if self.get_upload_url().startswith(RH_API_HOST):
|
|
|
37ae37 |
- return "Red Hat Customer Portal"
|
|
|
37ae37 |
+ return "Customer Portal"
|
|
|
37ae37 |
elif self.get_upload_url().startswith(RH_SFTP_HOST):
|
|
|
37ae37 |
return "Red Hat Secure FTP"
|
|
|
37ae37 |
return self.upload_url
|
|
|
37ae37 |
diff -uNrp sos-3.9.orig/sos/policies/redhat.py sos-3.9/sos/policies/redhat.py
|
|
|
37ae37 |
--- sos-3.9.orig/sos/policies/redhat.py 2024-02-20 15:01:09.246492057 +0000
|
|
|
37ae37 |
+++ sos-3.9/sos/policies/redhat.py 2024-02-20 15:05:28.352085526 +0000
|
|
|
37ae37 |
@@ -473,7 +473,7 @@ support representative.
|
|
|
37ae37 |
if not self.upload_url.startswith(RH_API_HOST):
|
|
|
37ae37 |
raise
|
|
|
37ae37 |
else:
|
|
|
37ae37 |
- print("Upload to Red Hat Customer Portal failed due to %s. "
|
|
|
37ae37 |
+ print("Upload to Customer Portal failed due to %s. "
|
|
|
37ae37 |
"Trying %s" % (e, RH_SFTP_HOST))
|
|
|
37ae37 |
self.upload_url = RH_SFTP_HOST
|
|
|
37ae37 |
uploaded = super(RHELPolicy, self).upload_archive(archive)
|