|
|
ab43f3 |
diff -uNrp sos-3.6.orig/sos/policies/redhat.py sos-3.6/sos/policies/redhat.py
|
|
|
ab43f3 |
--- sos-3.6.orig/sos/policies/redhat.py 2018-11-04 17:44:59.513116585 +0000
|
|
|
ab43f3 |
+++ sos-3.6/sos/policies/redhat.py 2018-11-04 17:53:28.333731059 +0000
|
|
|
ab43f3 |
@@ -32,9 +32,9 @@ OS_RELEASE = "/etc/os-release"
|
|
|
ab43f3 |
|
|
|
ab43f3 |
|
|
|
ab43f3 |
class RedHatPolicy(LinuxPolicy):
|
|
|
ab43f3 |
- distro = "Red Hat"
|
|
|
ab43f3 |
- vendor = "Red Hat"
|
|
|
ab43f3 |
- vendor_url = "http://www.redhat.com/"
|
|
|
ab43f3 |
+ distro = "CentOS"
|
|
|
ab43f3 |
+ vendor = "CentOS"
|
|
|
ab43f3 |
+ vendor_url = "http://www,centos.org/"
|
|
|
ab43f3 |
_redhat_release = '/etc/redhat-release'
|
|
|
ab43f3 |
_tmp_dir = "/var/tmp"
|
|
|
ab43f3 |
_rpmq_cmd = 'rpm -qa --queryformat "%{NAME}|%{VERSION}|%{RELEASE}\\n"'
|
|
|
ab43f3 |
@@ -92,9 +92,9 @@ class RedHatPolicy(LinuxPolicy):
|
|
|
ab43f3 |
|
|
|
ab43f3 |
@classmethod
|
|
|
ab43f3 |
def check(cls):
|
|
|
ab43f3 |
- """This method checks to see if we are running on Red Hat. It must be
|
|
|
ab43f3 |
+ """This method checks to see if we are running on CentOS. It must be
|
|
|
ab43f3 |
overriden by concrete subclasses to return True when running on a
|
|
|
ab43f3 |
- Fedora, RHEL or other Red Hat distribution or False otherwise."""
|
|
|
ab43f3 |
+ Fedora, RHEL or CentOS distribution or False otherwise."""
|
|
|
ab43f3 |
return False
|
|
|
ab43f3 |
|
|
|
ab43f3 |
def check_usrmove(self, pkgs):
|
|
|
ab43f3 |
@@ -185,7 +185,7 @@ class RedHatPolicy(LinuxPolicy):
|
|
|
ab43f3 |
return self.host_name()
|
|
|
ab43f3 |
|
|
|
ab43f3 |
|
|
|
ab43f3 |
-# Container environment variables on Red Hat systems.
|
|
|
ab43f3 |
+# Container environment variables on CentOS systems.
|
|
|
ab43f3 |
ENV_CONTAINER = 'container'
|
|
|
ab43f3 |
ENV_HOST_SYSROOT = 'HOST'
|
|
|
ab43f3 |
|
|
|
ab43f3 |
@@ -195,22 +195,22 @@ _opts_all_logs_verify = SoSOptions(all_l
|
|
|
ab43f3 |
_opts_all_logs_no_lsof = SoSOptions(all_logs=True,
|
|
|
ab43f3 |
plugopts=['process.lsof=off'])
|
|
|
ab43f3 |
|
|
|
ab43f3 |
-RHEL_RELEASE_STR = "Red Hat Enterprise Linux"
|
|
|
ab43f3 |
+RHEL_RELEASE_STR = "CentOS Linux"
|
|
|
ab43f3 |
|
|
|
ab43f3 |
RHV = "rhv"
|
|
|
ab43f3 |
-RHV_DESC = "Red Hat Virtualization"
|
|
|
ab43f3 |
+RHV_DESC = "CentOS Virtualization"
|
|
|
ab43f3 |
|
|
|
ab43f3 |
RHEL = "rhel"
|
|
|
ab43f3 |
RHEL_DESC = RHEL_RELEASE_STR
|
|
|
ab43f3 |
|
|
|
ab43f3 |
RHOSP = "rhosp"
|
|
|
ab43f3 |
-RHOSP_DESC = "Red Hat OpenStack Platform"
|
|
|
ab43f3 |
+RHOSP_DESC = "RDO"
|
|
|
ab43f3 |
|
|
|
ab43f3 |
RHOCP = "ocp"
|
|
|
ab43f3 |
-RHOCP_DESC = "OpenShift Container Platform by Red Hat"
|
|
|
ab43f3 |
+RHOCP_DESC = "OpenShift"
|
|
|
ab43f3 |
|
|
|
ab43f3 |
RH_SATELLITE = "satellite"
|
|
|
ab43f3 |
-RH_SATELLITE_DESC = "Red Hat Satellite"
|
|
|
ab43f3 |
+RH_SATELLITE_DESC = "Satellite"
|
|
|
ab43f3 |
|
|
|
ab43f3 |
NOTE_SIZE = "This preset may increase report size"
|
|
|
ab43f3 |
NOTE_TIME = "This preset may increase report run time"
|
|
|
ab43f3 |
@@ -230,9 +230,9 @@ rhel_presets = {
|
|
|
ab43f3 |
|
|
|
ab43f3 |
|
|
|
ab43f3 |
class RHELPolicy(RedHatPolicy):
|
|
|
ab43f3 |
- distro = RHEL_RELEASE_STR
|
|
|
ab43f3 |
- vendor = "Red Hat"
|
|
|
ab43f3 |
- vendor_url = "https://access.redhat.com/support/"
|
|
|
ab43f3 |
+ distro = "CentOS Linux"
|
|
|
ab43f3 |
+ vendor = "CentOS"
|
|
|
ab43f3 |
+ vendor_url = "https://wiki.centos.org/"
|
|
|
ab43f3 |
msg = _("""\
|
|
|
ab43f3 |
This command will collect diagnostic and configuration \
|
|
|
ab43f3 |
information from this %(distro)s system and installed \
|
|
|
ab43f3 |
@@ -262,7 +262,7 @@ No changes will be made to system config
|
|
|
ab43f3 |
def check(cls):
|
|
|
ab43f3 |
"""Test to see if the running host is a RHEL installation.
|
|
|
ab43f3 |
|
|
|
ab43f3 |
- Checks for the presence of the "Red Hat Enterprise Linux"
|
|
|
ab43f3 |
+ Checks for the presence of the "CentOS Linux"
|
|
|
ab43f3 |
release string at the beginning of the NAME field in the
|
|
|
ab43f3 |
`/etc/os-release` file and returns ``True`` if it is
|
|
|
ab43f3 |
found, and ``False`` otherwise.
|
|
|
ab43f3 |
@@ -324,7 +324,7 @@ No changes will be made to system config
|
|
|
ab43f3 |
|
|
|
ab43f3 |
ATOMIC = "atomic"
|
|
|
ab43f3 |
ATOMIC_RELEASE_STR = "Atomic"
|
|
|
ab43f3 |
-ATOMIC_DESC = "Red Hat Enterprise Linux Atomic Host"
|
|
|
ab43f3 |
+ATOMIC_DESC = "CentOS Linux Atomic Host"
|
|
|
ab43f3 |
|
|
|
ab43f3 |
atomic_presets = {
|
|
|
ab43f3 |
ATOMIC: PresetDefaults(name=ATOMIC, desc=ATOMIC_DESC, note=NOTE_TIME,
|
|
|
ab43f3 |
@@ -333,7 +333,7 @@ atomic_presets = {
|
|
|
ab43f3 |
|
|
|
ab43f3 |
|
|
|
ab43f3 |
class RedHatAtomicPolicy(RHELPolicy):
|
|
|
ab43f3 |
- distro = "Red Hat Atomic Host"
|
|
|
ab43f3 |
+ distro = "CentOS Atomic Host"
|
|
|
ab43f3 |
msg = _("""\
|
|
|
ab43f3 |
This command will collect diagnostic and configuration \
|
|
|
ab43f3 |
information from this %(distro)s system.
|