aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgalstrom21 <jshepher@rackspace.com>2012-07-11 21:14:01 -0500
committergalstrom21 <jshepher@rackspace.com>2012-07-11 21:14:01 -0500
commit8f60f746ba9589932db10278d25b1e250b42a9cb (patch)
treed655221ede925438523b52e064d22d5240502ed6
parent63e0b6fc9a9f64c2b786df7c9478aa03de9b0c7e (diff)
downloadsos-8f60f746ba9589932db10278d25b1e250b42a9cb.tar.gz
fixing pep8 violations in additional code
-rw-r--r--sos/plugins/openstack.py39
1 files changed, 30 insertions, 9 deletions
diff --git a/sos/plugins/openstack.py b/sos/plugins/openstack.py
index 20e6a270..b422b527 100644
--- a/sos/plugins/openstack.py
+++ b/sos/plugins/openstack.py
@@ -16,6 +16,7 @@ import os
from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+
class openstack(Plugin):
"""openstack related information
"""
@@ -23,6 +24,7 @@ class openstack(Plugin):
optionList = [("log", "gathers all openstack logs", "slow", False)]
+
class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin):
"""OpenStack related information for Debian based distributions
"""
@@ -84,14 +86,30 @@ class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin):
def setup(self):
# Nova
if os.path.exists("/usr/bin/nova-manage"):
- self.collectExtOutput("/usr/bin/nova-manage config list 2>/dev/null | sort", suggest_filename = "nova_config_list")
- self.collectExtOutput("/usr/bin/nova-manage service list 2>/dev/null", suggest_filename = "nova_service_list")
- self.collectExtOutput("/usr/bin/nova-manage db version 2>/dev/null", suggest_filename = "nova_db_version")
- self.collectExtOutput("/usr/bin/nova-manage fixed list 2>/dev/null", suggest_filename = "nova_fixed_ip_list")
- self.collectExtOutput("/usr/bin/nova-manage floating list 2>/dev/null", suggest_filename = "nova_floating_ip_list")
- self.collectExtOutput("/usr/bin/nova-manage flavor list 2>/dev/null", suggest_filename = "nova_flavor_list")
- self.collectExtOutput("/usr/bin/nova-manage network list 2>/dev/null", suggest_filename = "nova_network_list")
- self.collectExtOutput("/usr/bin/nova-manage vm list 2>/dev/null", suggest_filename = "nova_vm_list")
+ self.collectExtOutput(
+ "/usr/bin/nova-manage config list 2>/dev/null | sort",
+ suggest_filename="nova_config_list")
+ self.collectExtOutput(
+ "/usr/bin/nova-manage service list 2>/dev/null",
+ suggest_filename="nova_service_list")
+ self.collectExtOutput(
+ "/usr/bin/nova-manage db version 2>/dev/null",
+ suggest_filename="nova_db_version")
+ self.collectExtOutput(
+ "/usr/bin/nova-manage fixed list 2>/dev/null",
+ suggest_filename="nova_fixed_ip_list")
+ self.collectExtOutput(
+ "/usr/bin/nova-manage floating list 2>/dev/null",
+ suggest_filename="nova_floating_ip_list")
+ self.collectExtOutput(
+ "/usr/bin/nova-manage flavor list 2>/dev/null",
+ suggest_filename="nova_flavor_list")
+ self.collectExtOutput(
+ "/usr/bin/nova-manage network list 2>/dev/null",
+ suggest_filename="nova_network_list")
+ self.collectExtOutput(
+ "/usr/bin/nova-manage vm list 2>/dev/null",
+ suggest_filename="nova_vm_list")
self.addCopySpecs(["/etc/nova/",
"/var/log/nova/",
"/etc/default/nova-volume",
@@ -99,7 +117,9 @@ class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin):
"/etc/logrotate.d/nova-*"])
# Glance
if os.path.exists("/usr/bin/glance-manage"):
- self.collectExtOutput("/usr/bin/glance-manage db_version", suggest_filename = "glance_db_version")
+ self.collectExtOutput(
+ "/usr/bin/glance-manage db_version",
+ suggest_filename="glance_db_version")
self.addCopySpecs(["/etc/glance/",
"/var/log/glance/",
"/etc/logrotate.d/glance-*"])
@@ -113,6 +133,7 @@ class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin):
self.addCopySpecs(["/etc/quantum/",
"/var/log/quantum/"])
+
class RedHatOpenStack(openstack, RedHatPlugin):
"""OpenStack related information for Red Hat distributions
"""