From dda4e7261e77e92434294fe671a7310ab4fc79d2 Mon Sep 17 00:00:00 2001

From: "Bryn M. Reeves" <bmr@redhat.com>

Date: Thu, 11 Sep 2014 12:53:51 +0100

Subject: [PATCH] [openstack] backport OpenStack plugins from master

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

---

 sos/plugins/openstack.py            | 207 ------------------------------------

 sos/plugins/openstack_ceilometer.py |  67 ++++++++++++

 sos/plugins/openstack_cinder.py     |  86 +++++++++++++++

 sos/plugins/openstack_glance.py     |  64 +++++++++++

 sos/plugins/openstack_heat.py       |  68 ++++++++++++

 sos/plugins/openstack_horizon.py    |  81 ++++++++++++++

 sos/plugins/openstack_keystone.py   |  79 ++++++++++++++

 sos/plugins/openstack_neutron.py    | 178 +++++++++++++++++++++++++++++++

 sos/plugins/openstack_nova.py       | 152 ++++++++++++++++++++++++++

 sos/plugins/openstack_swift.py      |  62 +++++++++++

 10 files changed, 837 insertions(+), 207 deletions(-)

 delete mode 100644 sos/plugins/openstack.py

 create mode 100644 sos/plugins/openstack_ceilometer.py

 create mode 100644 sos/plugins/openstack_cinder.py

 create mode 100644 sos/plugins/openstack_glance.py

 create mode 100644 sos/plugins/openstack_heat.py

 create mode 100644 sos/plugins/openstack_horizon.py

 create mode 100644 sos/plugins/openstack_keystone.py

 create mode 100644 sos/plugins/openstack_neutron.py

 create mode 100644 sos/plugins/openstack_nova.py

 create mode 100644 sos/plugins/openstack_swift.py

diff --git a/sos/plugins/openstack.py b/sos/plugins/openstack.py

deleted file mode 100644

index 8c52136..0000000

--- a/sos/plugins/openstack.py

+++ /dev/null

@@ -1,207 +0,0 @@

-## Copyright (C) 2009 Red Hat, Inc., Joey Boggs <jboggs@redhat.com>

-## Copyright (C) 2012 Rackspace US, Inc., Justin Shepherd <jshepher@rackspace.com>

-

-### This program is free software; you can redistribute it and/or modify

-## it under the terms of the GNU General Public License as published by

-## the Free Software Foundation; either version 2 of the License, or

-## (at your option) any later version.

-

-## This program is distributed in the hope that it will be useful,

-## but WITHOUT ANY WARRANTY; without even the implied warranty of

-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-## GNU General Public License for more details.

-

-## You should have received a copy of the GNU General Public License

-## along with this program; if not, write to the Free Software

-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-

-import os

-

-from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin

-

-

-class OpenStack(Plugin):

-    """openstack related information

-    """

-    plugin_name = "openstack"

-

-    option_list = [("log", "gathers all openstack logs", "slow", False)]

-

-

-class DebianOpenStack(OpenStack, DebianPlugin, UbuntuPlugin):

-    """OpenStack related information for Debian based distributions

-    """

-

-    packages = ('cinder-api',

-                'cinder-backup',

-                'cinder-common',

-                'cinder-scheduler',

-                'cinder-volume',

-                'glance',

-                'glance-api',

-                'glance-client',

-                'glance-common',

-                'glance-registry',

-                'keystone',

-                'melange',

-                'nova-api-ec2',

-                'nova-api-metadata',

-                'nova-api-os-compute',

-                'nova-api-os-volume',

-                'nova-common',

-                'nova-compute',

-                'nova-compute-kvm',

-                'nova-compute-lxc',

-                'nova-compute-qemu',

-                'nova-compute-uml',

-                'nova-compute-xcp',

-                'nova-compute-xen',

-                'nova-xcp-plugins',

-                'nova-consoleauth',

-                'nova-network',

-                'nova-scheduler',

-                'nova-volume',

-                'novnc',

-                'openstack-dashboard',

-                'quantum-common',

-                'quantum-plugin-cisco',

-                'quantum-plugin-linuxbridge-agent',

-                'quantum-plugin-nicira',

-                'quantum-plugin-openvswitch',

-                'quantum-plugin-openvswitch-agent',

-                'quantum-plugin-ryu',

-                'quantum-plugin-ryu-agent',

-                'quantum-server',

-                'swift',

-                'swift-account',

-                'swift-container',

-                'swift-object',

-                'swift-proxy',

-                'swauth',

-                'python-cinder',

-                'python-cinderclient',

-                'python-django-horizon',

-                'python-glance',

-                'python-keystone',

-                'python-keystoneclient',

-                'python-melange',

-                'python-nova',

-                'python-novaclient',

-                'python-novnc',

-                'python-quantum',

-                'python-quantumclient',

-                'python-swift',

-                'python-swauth')

-

-    def setup(self):

-        # Nova

-        if os.path.exists("nova-manage"):

-            self.add_cmd_output(

-                "nova-manage config list 2>/dev/null | sort",

-                suggest_filename="nova_config_list")

-            self.add_cmd_output(

-                "nova-manage service list 2>/dev/null",

-                suggest_filename="nova_service_list")

-            self.add_cmd_output(

-                "nova-manage db version 2>/dev/null",

-                suggest_filename="nova_db_version")

-            self.add_cmd_output(

-                "nova-manage fixed list 2>/dev/null",

-                suggest_filename="nova_fixed_ip_list")

-            self.add_cmd_output(

-                "nova-manage floating list 2>/dev/null",

-                suggest_filename="nova_floating_ip_list")

-            self.add_cmd_output(

-                "nova-manage flavor list 2>/dev/null",

-                suggest_filename="nova_flavor_list")

-            self.add_cmd_output(

-                "nova-manage network list 2>/dev/null",

-                suggest_filename="nova_network_list")

-            self.add_cmd_output(

-                "nova-manage vm list 2>/dev/null",

-                suggest_filename="nova_vm_list")

-        self.add_copy_specs(["/etc/nova/",

-                           "/var/log/nova/",

-                           "/etc/default/nova-volume",

-                           "/etc/sudoers.d/nova_sudoers",

-                           "/etc/logrotate.d/nova-*"])

-        # Cinder

-        if os.path.exists("/usr/bin/cinder-manage"):

-            self.addCmdOutput(

-                "/usr/bin/cinder-manage db version",

-                suggest_filename="cinder_db_version")

-        self.addCopySpecs(["/etc/cinder/",

-                           "/var/log/cinder/",

-                           "/etc/logrotate.d/cinder-*"])

-        # Glance

-        if os.path.exists("glance-manage"):

-            self.add_cmd_output(

-                "glance-manage db_version",

-                suggest_filename="glance_db_version")

-        self.add_copy_specs(["/etc/glance/",

-                           "/var/log/glance/",

-                           "/etc/logrotate.d/glance-*"])

-        # Keystone

-        self.add_copy_specs(["/etc/keystone/",

-                           "/var/log/keystone/",

-                           "/etc/logrotate.d/keystone"])

-        # Swift

-        self.add_copy_specs(["/etc/swift/"])

-        # Quantum

-        self.add_copy_specs(["/etc/quantum/",

-                           "/var/log/quantum/"])

-

-

-class RedHatOpenStack(OpenStack, RedHatPlugin):

-    """OpenStack related information for Red Hat distributions

-    """

-

-    packages = ('openstack-nova',

-                'openstack-glance',

-                'openstack-dashboard',

-                'openstack-keystone',

-                'openstack-quantum',

-                'openstack-swift',

-                'openstack-swift-account',

-                'openstack-swift-container',

-                'openstack-swift-object',

-                'openstack-swift-proxy',

-                'swift',

-                'python-nova',

-                'python-glanceclient',

-                'python-keystoneclient',

-                'python-novaclient',

-                'python-openstackclient',

-                'python-quantumclient')

-

-    def setup(self):

-        # If RHEL or Fedora then invoke script for openstack-status

-        if (os.path.isfile('/etc/redhat-release')

-            or os.path.isfile('/etc/fedora-release')):

-            self.add_cmd_output("openstack-status")

-

-        # Nova

-        self.add_copy_specs(["/etc/nova/",

-                           "/var/log/nova/",

-                           "/var/lib/nova/",

-                           "/etc/polkit-1/localauthority/50-local.d/50-nova.pkla",

-                           "/etc/sudoers.d/nova",

-                           "/etc/logrotate.d/openstack-nova"])

-

-        # Glance

-        self.add_copy_specs(["/etc/glance/",

-                           "/var/log/glance/",

-                           "/etc/logrotate.d/openstack-glance"])

-

-        # Keystone

-        self.add_copy_specs(["/etc/keystone/",

-                           "/var/log/keystone/"])

-

-        # Quantum

-        self.add_copy_specs(["/etc/quantum/",

-                           "/var/log/quantum/"])

-

-    def postproc(self):

-        self.do_file_sub('/etc/keystone/keystone.conf',

-                    r"(admin_password\s*=\s*)(.*)",

-                    r"\1******")

diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py

new file mode 100644

--- /dev/null

+++ b/sos/plugins/openstack_ceilometer.py

@@ -0,0 +1,67 @@

+# Copyright (C) 2013 Red Hat, Inc., Eoghan Lynn <eglynn@redhat.com>

+# Copyright (C) 2012 Rackspace US, Inc.

+#               2012 Justin Shepherd <jshepher@rackspace.com>

+# Copyright (C) 2009 Red Hat, Inc.

+#               2009 Joey Boggs <jboggs@redhat.com>

+

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin

+

+

+class OpenStackCeilometer(Plugin):

+    """Openstack Ceilometer related information."""

+    plugin_name = "openstack_ceilometer"

+

+    option_list = [("log", "gathers openstack-ceilometer logs", "slow", False)]

+

+    def setup(self):

+        # Ceilometer

+        self.add_copy_specs([

+            "/etc/ceilometer/",

+            "/var/log/ceilometer"

+        ])

+

+

+class DebianOpenStackCeilometer(OpenStackCeilometer, DebianPlugin,

+                                UbuntuPlugin):

+    """OpenStackCeilometer related information for Debian based distributions.

+    """

+

+    packages = (

+        'ceilometer-api',

+        'ceilometer-agent-central',

+        'ceilometer-agent-compute',

+        'ceilometer-collector',

+        'ceilometer-common',

+        'python-ceilometer',

+        'python-ceilometerclient'

+    )

+

+

+class RedHatOpenStackCeilometer(OpenStackCeilometer, RedHatPlugin):

+    """OpenStackCeilometer related information for Red Hat distributions."""

+

+    packages = (

+        'openstack-ceilometer',

+        'openstack-ceilometer-api',

+        'openstack-ceilometer-central',

+        'openstack-ceilometer-collector',

+        'openstack-ceilometer-common',

+        'openstack-ceilometer-compute',

+        'python-ceilometerclient'

+    )

+

+# vim: et ts=4 sw=4

diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py

new file mode 100644

--- /dev/null

+++ b/sos/plugins/openstack_cinder.py

@@ -0,0 +1,86 @@

+# Copyright (C) 2009 Red Hat, Inc., Joey Boggs <jboggs@redhat.com>

+# Copyright (C) 2012 Rackspace US, Inc.,

+#                    Justin Shepherd <jshepher@rackspace.com>

+# Copyright (C) 2013 Red Hat, Inc., Flavio Percoco <fpercoco@redhat.com>

+# Copyright (C) 2013 Red Hat, Inc., Jeremy Agee <jagee@redhat.com>

+

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin

+

+

+class OpenStackCinder(Plugin):

+    """openstack cinder related information

+    """

+    plugin_name = "openstack_cinder"

+

+    option_list = [("log", "gathers openstack cinder logs", "slow", True),

+                   ("db", "gathers openstack cinder db version", "slow",

+                    False)]

+

+    def setup(self):

+        if self.get_option("db"):

+            self.add_cmd_output(

+                "cinder-manage db version",

+                suggest_filename="cinder_db_version")

+

+        self.add_copy_specs(["/etc/cinder/"])

+

+        if self.get_option("log"):

+            self.add_copy_specs(["/var/log/cinder/"])

+

+

+class DebianOpenStackCinder(OpenStackCinder, DebianPlugin, UbuntuPlugin):

+    """OpenStack Cinder related information for Debian based distributions

+    """

+

+    cinder = False

+    packages = (

+        'cinder-api',

+        'cinder-backup',

+        'cinder-common',

+        'cinder-scheduler',

+        'cinder-volume',

+        'python-cinder',

+        'python-cinderclient'

+    )

+

+    def check_enabled(self):

+        self.cinder = self.is_installed("cinder-common")

+        return self.cinder

+

+    def setup(self):

+        super(DebianOpenStackCinder, self).setup()

+

+

+class RedHatOpenStackCinder(OpenStackCinder, RedHatPlugin):

+    """OpenStack related information for Red Hat distributions

+    """

+

+    cinder = False

+    packages = ('openstack-cinder',

+                'python-cinder',

+                'python-cinderclient')

+

+    def check_enabled(self):

+        self.cinder = self.is_installed("openstack-cinder")

+        return self.cinder

+

+    def setup(self):

+        super(RedHatOpenStackCinder, self).setup()

+        self.add_copy_specs(["/etc/sudoers.d/cinder"])

+

+

+# vim: et ts=4 sw=4

diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py

new file mode 100644

--- /dev/null

+++ b/sos/plugins/openstack_glance.py

@@ -0,0 +1,64 @@

+# Copyright (C) 2013 Red Hat, Inc., Flavio Percoco <fpercoco@redhat.com>

+# Copyright (C) 2012 Rackspace US, Inc.,

+#                    Justin Shepherd <jshepher@rackspace.com>

+# Copyright (C) 2009 Red Hat, Inc., Joey Boggs <jboggs@redhat.com>

+

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+from sos import plugins

+

+

+class OpenStackGlance(plugins.Plugin):

+    """OpenstackGlance related information."""

+    plugin_name = "openstack_glance"

+

+    option_list = [("log", "gathers openstack-glance logs", "slow", False)]

+

+    def setup(self):

+        # Glance

+        self.add_cmd_output(

+            "glance-manage db_version",

+            suggest_filename="glance_db_version"

+        )

+        self.add_copy_specs([

+            "/etc/glance/",

+            "/var/log/glance/"

+        ])

+

+

+class DebianOpenStackGlance(OpenStackGlance,

+                            plugins.DebianPlugin,

+                            plugins.UbuntuPlugin):

+    """OpenStackGlance related information for Debian based distributions."""

+

+    packages = (

+        'glance',

+        'glance-api',

+        'glance-client',

+        'glance-common',

+        'glance-registry',

+        'python-glance'

+    )

+

+

+class RedHatOpenStackGlance(OpenStackGlance, plugins.RedHatPlugin):

+    """OpenStackGlance related information for Red Hat distributions."""

+

+    packages = (

+        'openstack-glance',

+        'python-glanceclient'

+    )

+

+# vim: et ts=4 sw=4

diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py

new file mode 100644

--- /dev/null

+++ b/sos/plugins/openstack_heat.py

@@ -0,0 +1,68 @@

+# Copyright (C) 2013 Red Hat, Inc.

+

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+from sos import plugins

+

+

+class OpenStackHeat(plugins.Plugin):

+    """openstack related information

+    """

+    plugin_name = "openstack_heat"

+

+    option_list = [("log", "gathers openstack-heat logs", "slow", False)]

+

+    def setup(self):

+        # Heat

+        self.add_cmd_output(

+            "heat-manage db_version",

+            suggest_filename="heat_db_version"

+        )

+        self.add_copy_specs([

+            "/etc/heat/",

+            "/var/log/heat/"

+        ])

+

+

+class DebianOpenStack(OpenStackHeat,

+                      plugins.DebianPlugin,

+                      plugins.UbuntuPlugin):

+    """OpenStackHeat related information for Debian based distributions."""

+

+    packages = (

+        'heat-api',

+        'heat-api-cfn',

+        'heat-api-cloudwatch',

+        'heat-common',

+        'heat-engine',

+        'python-heat',

+        'python-heatclient'

+    )

+

+

+class RedHatOpenStack(OpenStackHeat, plugins.RedHatPlugin):

+    """OpenStackHeat related information for Red Hat distributions."""

+

+    packages = (

+        'openstack-heat-api',

+        'openstack-heat-api-cfn',

+        'openstack-heat-api-cloudwatch',

+        'openstack-heat-cli',

+        'openstack-heat-common',

+        'openstack-heat-engine',

+        'python-heatclient'

+    )

+

+# vim: et ts=4 sw=4

diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py

new file mode 100644

--- /dev/null

+++ b/sos/plugins/openstack_horizon.py

@@ -0,0 +1,81 @@

+# Copyright (C) 2009 Red Hat, Inc., Joey Boggs <jboggs@redhat.com>

+# Copyright (C) 2012 Rackspace US, Inc.,

+#                    Justin Shepherd <jshepher@rackspace.com>

+# Copyright (C) 2013 Red Hat, Inc., Jeremy Agee <jagee@redhat.com>

+

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin

+

+

+class OpenStackHorizon(Plugin):

+    """openstack horizon related information

+    """

+

+    plugin_name = "openstack_horizon"

+    option_list = [("log", "gathers openstack horizon logs", "slow", True)]

+

+    def setup(self):

+        self.add_copy_spec("/etc/openstack-dashboard/")

+        if self.get_option("log"):

+            self.add_copy_spec("/var/log/horizon/")

+

+

+class DebianOpenStackHorizon(OpenStackHorizon, DebianPlugin):

+    """OpenStack Horizon related information for Debian based distributions

+    """

+

+    packages = (

+        'python-django-horizon',

+        'openstack-dashboard',

+        'openstack-dashboard-apache'

+    )

+

+    def setup(self):

+        super(DebianOpenStackHorizon, self).setup()

+        self.add_copy_spec("/etc/apache2/sites-available/")

+

+

+class UbuntuOpenStackHorizon(OpenStackHorizon, UbuntuPlugin):

+    """OpenStack Horizon related information for Ubuntu based distributions

+    """

+

+    packages = (

+        'python-django-horizon',

+        'openstack-dashboard',

+        'openstack-dashboard-ubuntu-theme'

+    )

+

+    def setup(self):

+        super(UbuntuOpenStackHorizon, self).setup()

+        self.add_copy_spec("/etc/apache2/conf.d/openstack-dashboard.conf")

+

+

+class RedHatOpenStackHorizon(OpenStackHorizon, RedHatPlugin):

+    """OpenStack Horizon related information for Red Hat distributions

+    """

+

+    packages = (

+        'python-django-horizon',

+        'openstack-dashboard'

+    )

+

+    def setup(self):

+        super(RedHatOpenStackHorizon, self).setup()

+        self.add_copy_spec("/etc/httpd/conf.d/openstack-dashboard.conf")

+        if self.get_option("log"):

+            self.add_copy_spec("/var/log/httpd/")

+

+# vim: et ts=4 sw=4

diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py

new file mode 100644

--- /dev/null

+++ b/sos/plugins/openstack_keystone.py

@@ -0,0 +1,79 @@

+# Copyright (C) 2013 Red Hat, Inc., Jeremy Agee <jagee@redhat.com>

+

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+

+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin

+

+

+class OpenStackKeystone(Plugin):

+    """openstack keystone related information

+    """

+    plugin_name = "openstack_keystone"

+

+    option_list = [("log", "gathers openstack keystone logs", "slow", True),

+                   ("nopw", "dont gathers keystone passwords", "slow", True)]

+

+    def setup(self):

+        self.add_copy_specs([

+            "/etc/keystone/default_catalog.templates",

+            "/etc/keystone/keystone.conf",

+            "/etc/keystone/logging.conf",

+            "/etc/keystone/policy.json"

+        ])

+

+        if self.get_option("log"):

+            self.add_copy_spec("/var/log/keystone/")

+

+    def postproc(self):

+        self.do_file_sub('/etc/keystone/keystone.conf',

+                         r"(?m)^(admin_password.*=)(.*)",

+                         r"\1 ******")

+        self.do_file_sub('/etc/keystone/keystone.conf',

+                         r"(?m)^(admin_token.*=)(.*)",

+                         r"\1 ******")

+        self.do_file_sub('/etc/keystone/keystone.conf',

+                         r"(?m)^(connection.*=.*mysql://)(.*)(:)(.*)(@)(.*)",

+                         r"\1\2:******@\6")

+        self.do_file_sub('/etc/keystone/keystone.conf',

+                         r"(?m)^(password.*=)(.*)",

+                         r"\1 ******")

+        self.do_file_sub('/etc/keystone/keystone.conf',

+                         r"(?m)^(ca_password.*=)(.*)",

+                         r"\1 ******")

+

+

+class DebianOpenStackKeystone(OpenStackKeystone, DebianPlugin, UbuntuPlugin):

+    """OpenStack Keystone related information for Debian based distributions

+    """

+

+    packages = (

+        'keystone',

+        'python-keystone',

+        'python-keystoneclient'

+    )

+

+

+class RedHatOpenStackKeystone(OpenStackKeystone, RedHatPlugin):

+    """OpenStack Keystone related information for Red Hat distributions

+    """

+

+    packages = (

+        'openstack-keystone',

+        'python-keystone',

+        'python-django-openstack-auth',

+        'python-keystoneclient'

+    )

+

+# vim: et ts=4 sw=4

diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py

new file mode 100644