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