|
 |
52984c |
From a777e0713172080b4acdcd601dba4fcb3965925d Mon Sep 17 00:00:00 2001
|
|
|
52984c |
From: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
52984c |
Date: Wed, 7 Nov 2018 15:47:46 -0500
|
|
|
52984c |
Subject: [PATCH] [sos_collector] Fix cluster option reporting
|
|
|
52984c |
|
|
|
52984c |
No longer call a removed method that handled loading cluster profiles
|
|
|
52984c |
before that was moved into the Configuration() class.
|
|
|
52984c |
|
|
|
52984c |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
52984c |
---
|
|
|
52984c |
soscollector/sos_collector.py | 4 +---
|
|
|
52984c |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
52984c |
|
|
|
52984c |
diff --git a/soscollector/sos_collector.py b/soscollector/sos_collector.py
|
|
|
52984c |
index e7f3ea7..70a3dc8 100644
|
|
|
52984c |
--- a/soscollector/sos_collector.py
|
|
|
52984c |
+++ b/soscollector/sos_collector.py
|
|
|
52984c |
@@ -48,13 +48,13 @@ class SosCollector():
|
|
|
52984c |
self.master = False
|
|
|
52984c |
self.retrieved = 0
|
|
|
52984c |
self.need_local_sudo = False
|
|
|
52984c |
+ self.clusters = self.config['cluster_types']
|
|
|
52984c |
if not self.config['list_options']:
|
|
|
52984c |
try:
|
|
|
52984c |
if not self.config['tmp_dir']:
|
|
|
52984c |
self.create_tmp_dir()
|
|
|
52984c |
self._setup_logging()
|
|
|
52984c |
self.log_debug('Executing %s' % ' '.join(s for s in sys.argv))
|
|
|
52984c |
- self.clusters = self.config['cluster_types']
|
|
|
52984c |
self.log_debug("Found cluster profiles: %s"
|
|
|
52984c |
% self.clusters.keys())
|
|
|
52984c |
self.log_debug("Found supported host types: %s"
|
|
|
52984c |
@@ -63,8 +63,6 @@ class SosCollector():
|
|
|
52984c |
self.prep()
|
|
|
52984c |
except KeyboardInterrupt:
|
|
|
52984c |
self._exit('Exiting on user cancel', 130)
|
|
|
52984c |
- else:
|
|
|
52984c |
- self._load_clusters()
|
|
|
52984c |
|
|
|
52984c |
def _setup_logging(self):
|
|
|
52984c |
# behind the scenes logging
|
|
|
52984c |
--
|
|
|
52984c |
2.14.4
|
|
|
52984c |
|