diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2014-10-09 17:07:38 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2015-01-14 11:15:12 +0000 |
| commit | 3f8c4b658c5d702bde59bdd98cb114ea0064eae9 (patch) | |
| tree | e7fc473787ad8cc212db0ac0ae06c9fc379cbd50 | |
| parent | ed44939d5988098feb3f3ddededd68a0a4b9a9df (diff) | |
| download | sos-3f8c4b658c5d702bde59bdd98cb114ea0064eae9.tar.gz | |
[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>
| -rw-r--r-- | sos/plugins/openstack_neutron.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py index dba192ee..d37430ef 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([ |