aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stokes <adam.stokes@ubuntu.com>2013-10-31 11:06:02 -0400
committerAdam Stokes <adam.stokes@ubuntu.com>2013-10-31 11:07:00 -0400
commitd8351bdda8886a5ad8b86c0a24f6d17d71771aac (patch)
tree1a48021c2524572963544de09206750c34345658
parentf08eac0d9ee051edb15b46c6746997936793b9d7 (diff)
parent14feacc037f9de91cd5f3f631a3ca3b6ef54fa0e (diff)
downloadsos-d8351bdda8886a5ad8b86c0a24f6d17d71771aac.tar.gz
Merge branch 'add-neutron-check-enabled' of github.com:jdutton/sosreport into jdutton-add-neutron-check-enabled
Fixes #211 Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
-rw-r--r--sos/plugins/neutron.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/sos/plugins/neutron.py b/sos/plugins/neutron.py
index 03403227..23174330 100644
--- a/sos/plugins/neutron.py
+++ b/sos/plugins/neutron.py
@@ -139,6 +139,9 @@ class DebianNeutron(Neutron, DebianPlugin, UbuntuPlugin):
'python-%(comp)s',
'python-%(comp)sclient']
+ def check_enabled(self):
+ return self.is_installed("%s-common" % self.component_name)
+
def setup(self):
super(DebianNeutron, self).setup()
self.packages = self.gen_pkg_tuple(self.package_list_template)
@@ -166,6 +169,9 @@ class RedHatNeutron(Neutron, RedHatPlugin):
'python-%(comp)s',
'python-%(comp)sclient']
+ def check_enabled(self):
+ return self.is_installed("openstack-%s" % self.component_name)
+
def setup(self):
super(RedHatNeutron, self).setup()
self.packages = self.gen_pkg_tuple(self.package_list_template)