aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Pevec <apevec@redhat.com>2013-11-29 18:14:31 +0100
committerAdam Stokes <adam.stokes@ubuntu.com>2013-12-02 10:03:00 -0500
commitdd7857dd39deb69e26cb1fa5b0549ebc2ba82428 (patch)
tree870ea83d46c0bb2e3bae0ef960968d98ad825e22
parent85e86e24c24165af582ab0c75fd391aaa871f145 (diff)
downloadsos-dd7857dd39deb69e26cb1fa5b0549ebc2ba82428.tar.gz
Rename OpenStack Quantum to Neutron
This rename happened in now current release OpenStack Havana. Fixes #220 Signed-off-by: Alan Pevec <apevec@redhat.com> Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
-rw-r--r--sos/plugins/openstack_neutron.py90
-rw-r--r--sos/plugins/openstack_quantum.py90
2 files changed, 90 insertions, 90 deletions
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
new file mode 100644
index 00000000..d063a7c4
--- /dev/null
+++ b/sos/plugins/openstack_neutron.py
@@ -0,0 +1,90 @@
+## 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.
+
+import os
+
+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+
+
+class OpenStackNeutron(Plugin):
+ """openstack neutron related information
+ """
+ plugin_name = "openstack-neutron"
+
+ option_list = [("log", "gathers openstack neutron logs", "slow", True)]
+
+ def setup(self):
+ self.add_copy_specs(["/etc/neutron/"])
+
+ if self.option_enabled("log"):
+ self.add_copy_specs(["/var/log/neutron/"])
+
+
+class DebianOpenStackNeutron(OpenStackNeutron, DebianPlugin, UbuntuPlugin):
+ """OpenStack Neutron related information for Debian based distributions
+ """
+
+ neutron = False
+ packages = ('neutron-common',
+ 'neutron-plugin-cisco',
+ 'neutron-plugin-linuxbridge-agent',
+ 'neutron-plugin-nicira',
+ 'neutron-plugin-openvswitch',
+ 'neutron-plugin-openvswitch-agent',
+ 'neutron-plugin-ryu',
+ 'neutron-plugin-ryu-agent',
+ 'neutron-server',
+ 'python-neutron',
+ 'python-neutronclient')
+
+ def check_enabled(self):
+ self.neutron = self.is_installed("neutron-common")
+ return self.neutron
+
+ def setup(self):
+ super(DebianOpenStackNeutron, self).setup()
+ self.add_copy_specs(["/etc/sudoers.d/neutron_sudoers"])
+
+
+class RedHatOpenStackNeutron(OpenStackNeutron, RedHatPlugin):
+ """OpenStack Neutron related information for Red Hat distributions
+ """
+
+ neutron = False
+ packages = ('openstack-neutron-bigswitch',
+ 'openstack-neutron-brocade',
+ 'openstack-neutron-cisco',
+ 'openstack-neutron-hyperv',
+ 'openstack-neutron-linuxbridge',
+ 'openstack-neutron-metaplugin',
+ 'openstack-neutron-midonet',
+ 'openstack-neutron-nec',
+ 'openstack-neutron-nicira',
+ 'openstack-neutron-openvswitch',
+ 'openstack-neutron-plumgrid',
+ 'openstack-neutron-ryu',
+ 'python-neutron',
+ 'python-neutronclient',
+ 'openstack-neutron')
+
+ def check_enabled(self):
+ self.neutron = self.is_installed("openstack-neutron")
+ return self.neutron
+
+ def setup(self):
+ super(RedHatOpenStackNeutron, self).setup()
diff --git a/sos/plugins/openstack_quantum.py b/sos/plugins/openstack_quantum.py
deleted file mode 100644
index 96fb90b3..00000000
--- a/sos/plugins/openstack_quantum.py
+++ /dev/null
@@ -1,90 +0,0 @@
-## 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.
-
-import os
-
-from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-
-
-class OpenStackQuantum(Plugin):
- """openstack quantum related information
- """
- plugin_name = "openstack-quantum"
-
- option_list = [("log", "gathers openstack quantum logs", "slow", True)]
-
- def setup(self):
- self.add_copy_specs(["/etc/quantum/"])
-
- if self.option_enabled("log"):
- self.add_copy_specs(["/var/log/quantum/"])
-
-
-class DebianOpenStackQuantum(OpenStackQuantum, DebianPlugin, UbuntuPlugin):
- """OpenStack Quantum related information for Debian based distributions
- """
-
- quantum = False
- packages = ('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',
- 'python-quantum',
- 'python-quantumclient')
-
- def check_enabled(self):
- self.quantum = self.is_installed("quantum-common")
- return self.quantum
-
- def setup(self):
- super(DebianOpenStackQuantum, self).setup()
- self.add_copy_specs(["/etc/sudoers.d/quantum_sudoers"])
-
-
-class RedHatOpenStackQuantum(OpenStackQuantum, RedHatPlugin):
- """OpenStack Quantum related information for Red Hat distributions
- """
-
- quantum = False
- packages = ('openstack-quantum-bigswitch',
- 'openstack-quantum-brocade',
- 'openstack-quantum-cisco',
- 'openstack-quantum-hyperv',
- 'openstack-quantum-linuxbridge',
- 'openstack-quantum-metaplugin',
- 'openstack-quantum-midonet',
- 'openstack-quantum-nec',
- 'openstack-quantum-nicira',
- 'openstack-quantum-openvswitch',
- 'openstack-quantum-plumgrid',
- 'openstack-quantum-ryu',
- 'python-quantum',
- 'python-quantumclient',
- 'openstack-quantum')
-
- def check_enabled(self):
- self.quantum = self.is_installed("openstack-quantum")
- return self.quantum
-
- def setup(self):
- super(RedHatOpenStackQuantum, self).setup()