From ebc0cae8c8f7671a29c620ce857367d78e284eed Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 24 2014 13:49:59 +0000 Subject: modify centos branding patch --- diff --git a/SOURCES/sos-centos-branding.patch b/SOURCES/sos-centos-branding.patch index 12e8f1a..4353529 100644 --- a/SOURCES/sos-centos-branding.patch +++ b/SOURCES/sos-centos-branding.patch @@ -1338,18 +1338,6 @@ diff -uNrp sos-3.0.orig/sos/plugins/openssl.py sos-3.0/sos/plugins/openssl.py """ files = ('/etc/pki/tls/openssl.cnf',) -diff -uNrp sos-3.0.orig/sos/plugins/openstack.py sos-3.0/sos/plugins/openstack.py ---- sos-3.0.orig/sos/plugins/openstack.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/openstack.py 2014-06-21 11:20:20.438520002 -0500 -@@ -153,7 +153,7 @@ class DebianOpenStack(OpenStack, DebianP - - - class RedHatOpenStack(OpenStack, RedHatPlugin): -- """OpenStack related information for Red Hat distributions -+ """OpenStack related information for CentOS distributions - """ - - packages = ('openstack-nova', diff -uNrp sos-3.0.orig/sos/plugins/postgresql.py sos-3.0/sos/plugins/postgresql.py --- sos-3.0.orig/sos/plugins/postgresql.py 2013-06-10 12:35:56.000000000 -0500 +++ sos-3.0/sos/plugins/postgresql.py 2014-06-21 11:20:20.438520002 -0500 @@ -1460,3 +1448,111 @@ diff -uNrp sos-3.0.orig/sos/policies/redhat.py sos-3.0/sos/policies/redhat.py def __init__(self): super(RHELPolicy, self).__init__() +diff -uNrp sos-3.0.orig/sos/plugins/openstack_ceilometer.py sos-3.0/sos/plugins/openstack_ceilometer.py +--- sos-3.0.orig/sos/plugins/openstack_ceilometer.py 2014-11-24 07:46:02.257461867 -0600 ++++ sos-3.0/sos/plugins/openstack_ceilometer.py 2014-11-24 07:46:31.458305712 -0600 +@@ -52,7 +52,7 @@ class DebianOpenStackCeilometer(OpenStac + + + class RedHatOpenStackCeilometer(OpenStackCeilometer, RedHatPlugin): +- """OpenStackCeilometer related information for Red Hat distributions.""" ++ """OpenStackCeilometer related information for CentOS distributions.""" + + packages = ( + 'openstack-ceilometer', +diff -uNrp sos-3.0.orig/sos/plugins/openstack_cinder.py sos-3.0/sos/plugins/openstack_cinder.py +--- sos-3.0.orig/sos/plugins/openstack_cinder.py 2014-11-24 07:46:02.257461867 -0600 ++++ sos-3.0/sos/plugins/openstack_cinder.py 2014-11-24 07:46:31.458305712 -0600 +@@ -66,7 +66,7 @@ class DebianOpenStackCinder(OpenStackCin + + + class RedHatOpenStackCinder(OpenStackCinder, RedHatPlugin): +- """OpenStack related information for Red Hat distributions ++ """OpenStack related information for CentOS distributions + """ + + cinder = False +diff -uNrp sos-3.0.orig/sos/plugins/openstack_glance.py sos-3.0/sos/plugins/openstack_glance.py +--- sos-3.0.orig/sos/plugins/openstack_glance.py 2014-11-24 07:46:02.257461867 -0600 ++++ sos-3.0/sos/plugins/openstack_glance.py 2014-11-24 07:46:31.459305705 -0600 +@@ -54,7 +54,7 @@ class DebianOpenStackGlance(OpenStackGla + + + class RedHatOpenStackGlance(OpenStackGlance, plugins.RedHatPlugin): +- """OpenStackGlance related information for Red Hat distributions.""" ++ """OpenStackGlance related information for CentOS distributions.""" + + packages = ( + 'openstack-glance', +diff -uNrp sos-3.0.orig/sos/plugins/openstack_heat.py sos-3.0/sos/plugins/openstack_heat.py +--- sos-3.0.orig/sos/plugins/openstack_heat.py 2014-11-24 07:46:02.257461867 -0600 ++++ sos-3.0/sos/plugins/openstack_heat.py 2014-11-24 07:46:31.459305705 -0600 +@@ -53,7 +53,7 @@ class DebianOpenStack(OpenStackHeat, + + + class RedHatOpenStack(OpenStackHeat, plugins.RedHatPlugin): +- """OpenStackHeat related information for Red Hat distributions.""" ++ """OpenStackHeat related information for CentOS distributions.""" + + packages = ( + 'openstack-heat-api', +diff -uNrp sos-3.0.orig/sos/plugins/openstack_horizon.py sos-3.0/sos/plugins/openstack_horizon.py +--- sos-3.0.orig/sos/plugins/openstack_horizon.py 2014-11-24 07:46:02.257461867 -0600 ++++ sos-3.0/sos/plugins/openstack_horizon.py 2014-11-24 07:46:31.459305705 -0600 +@@ -64,7 +64,7 @@ class UbuntuOpenStackHorizon(OpenStackHo + + + class RedHatOpenStackHorizon(OpenStackHorizon, RedHatPlugin): +- """OpenStack Horizon related information for Red Hat distributions ++ """OpenStack Horizon related information for CentOS distributions + """ + + packages = ( +diff -uNrp sos-3.0.orig/sos/plugins/openstack_keystone.py sos-3.0/sos/plugins/openstack_keystone.py +--- sos-3.0.orig/sos/plugins/openstack_keystone.py 2014-11-24 07:46:02.257461867 -0600 ++++ sos-3.0/sos/plugins/openstack_keystone.py 2014-11-24 07:46:31.459305705 -0600 +@@ -66,7 +66,7 @@ class DebianOpenStackKeystone(OpenStackK + + + class RedHatOpenStackKeystone(OpenStackKeystone, RedHatPlugin): +- """OpenStack Keystone related information for Red Hat distributions ++ """OpenStack Keystone related information for CentOS distributions + """ + + packages = ( +diff -uNrp sos-3.0.orig/sos/plugins/openstack_neutron.py sos-3.0/sos/plugins/openstack_neutron.py +--- sos-3.0.orig/sos/plugins/openstack_neutron.py 2014-11-24 07:46:02.257461867 -0600 ++++ sos-3.0/sos/plugins/openstack_neutron.py 2014-11-24 07:46:31.459305705 -0600 +@@ -143,7 +143,7 @@ class DebianNeutron(Neutron, DebianPlugi + + + class RedHatNeutron(Neutron, RedHatPlugin): +- """OpenStack Neutron related information for Red Hat distributions ++ """OpenStack Neutron related information for CentOS distributions + """ + + package_list_template = [ +diff -uNrp sos-3.0.orig/sos/plugins/openstack_nova.py sos-3.0/sos/plugins/openstack_nova.py +--- sos-3.0.orig/sos/plugins/openstack_nova.py 2014-11-24 07:46:02.257461867 -0600 ++++ sos-3.0/sos/plugins/openstack_nova.py 2014-11-24 07:46:31.459305705 -0600 +@@ -113,7 +113,7 @@ class DebianOpenStackNova(OpenStackNova, + + + class RedHatOpenStackNova(OpenStackNova, RedHatPlugin): +- """OpenStack nova related information for Red Hat distributions ++ """OpenStack nova related information for CentOS distributions + """ + + nova = False +diff -uNrp sos-3.0.orig/sos/plugins/openstack_swift.py sos-3.0/sos/plugins/openstack_swift.py +--- sos-3.0.orig/sos/plugins/openstack_swift.py 2014-11-24 07:46:02.257461867 -0600 ++++ sos-3.0/sos/plugins/openstack_swift.py 2014-11-24 07:46:31.459305705 -0600 +@@ -47,7 +47,7 @@ class DebianOpenStackSwift(OpenStackSwif + + + class RedHatOpenStackSwift(OpenStackSwift, RedHatPlugin): +- """OpenStackSwift related information for Red Hat distributions.""" ++ """OpenStackSwift related information for CentOS distributions.""" + + packages = ( + 'openstack-swift',