aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Moravec <pmoravec@redhat.com>2018-07-03 13:02:09 +0200
committerBryn M. Reeves <bmr@redhat.com>2018-07-12 14:41:23 +0100
commit62f4affbc9fb6da06dd5707e9aa659d206352e87 (patch)
tree9542a801f3e126a52583e6e86a4e584a2754cf4c
parent4127d02f00561b458398ce2b5ced7ae853b23227 (diff)
downloadsos-62f4affbc9fb6da06dd5707e9aa659d206352e87.tar.gz
[rhui] Fix detection of CDS for RHUI3
Detection of CDS node on RHUI 3 cant rely on deprecated pulp-cds package but rather on rhui-mirrorlist one. Resolves: #1375 Signed-off-by: Pavel Moravec <pmoravec@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/rhui.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/sos/plugins/rhui.py b/sos/plugins/rhui.py
index 2b1e2baa..459a8983 100644
--- a/sos/plugins/rhui.py
+++ b/sos/plugins/rhui.py
@@ -22,7 +22,11 @@ class Rhui(Plugin, RedHatPlugin):
files = [rhui_debug_path]
def setup(self):
- if self.is_installed("pulp-cds"):
+ cds_installed = [
+ self.is_installed("pulp-cds"),
+ self.is_installed("rhui-mirrorlist")
+ ]
+ if any(cds_installed):
cds = "--cds"
else:
cds = ""