From 3f8c4b658c5d702bde59bdd98cb114ea0064eae9 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Thu, 9 Oct 2014 17:07:38 +0100
Subject: [PATCH] [openstack_neutron] fix legacy component detection test
Currently the Neutron plugin will assume it's running on a Neutron
(rather than a legacy Quantum) installation if:
- '/etc/neutron' exists AND the user specifies quantum=True
Otherwise it's assumed to be a Quantum install. This is clearly
broken; the sense of the 'openstack_neutron.quantum' part of the
test should be inverted.
Fixes #420.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
sos/plugins/openstack_neutron.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
index dba192e..d37430e 100644
--- a/sos/plugins/openstack_neutron.py
+++ b/sos/plugins/openstack_neutron.py
@@ -40,10 +40,7 @@ class Neutron(Plugin):
component_name = "neutron"
def setup(self):
- if os.path.exists("/etc/neutron/") and \
- self.get_option("quantum", False):
- self.component_name = self.plugin_name
- else:
+ if not os.path.exists("/etc/neutron/") or self.get_option("quantum"):
self.component_name = "quantum"
self.add_copy_spec([
--
1.8.3.1