|
 |
42837f |
From c9157c5072aeeae23e2de25080deeea959ac7dc5 Mon Sep 17 00:00:00 2001
|
|
|
42837f |
From: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
42837f |
Date: Wed, 17 Oct 2018 11:45:48 -0400
|
|
|
42837f |
Subject: [PATCH] [sos_collector] Configure initial sosreport command after
|
|
|
42837f |
case id prompt
|
|
|
42837f |
|
|
|
42837f |
We were previously configuring the initial sosreport command before the
|
|
|
42837f |
case id prompt when a user didn't specify either --case-id or --batch on
|
|
|
42837f |
the commandline, thus only the sos-collector archive would have the case
|
|
|
42837f |
id and not the sosreports run on the nodes. No other options were
|
|
|
42837f |
affected by this, and case ids are now properly set on all node
|
|
|
42837f |
sosreports.
|
|
|
42837f |
|
|
|
42837f |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
42837f |
---
|
|
|
42837f |
soscollector/sos_collector.py | 2 +-
|
|
|
42837f |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
42837f |
|
|
|
42837f |
diff --git a/soscollector/sos_collector.py b/soscollector/sos_collector.py
|
|
|
42837f |
index 1e66de2..c0044ec 100644
|
|
|
42837f |
--- a/soscollector/sos_collector.py
|
|
|
42837f |
+++ b/soscollector/sos_collector.py
|
|
|
42837f |
@@ -264,7 +264,6 @@ this utility or remote systems that it connects to.
|
|
|
42837f |
self.console.info("\nsos-collector (version %s)\n" % __version__)
|
|
|
42837f |
intro_msg = self._fmt_msg(disclaimer % self.config['tmp_dir'])
|
|
|
42837f |
self.console.info(intro_msg)
|
|
|
42837f |
- self.configure_sos_cmd()
|
|
|
42837f |
prompt = "\nPress ENTER to continue, or CTRL-C to quit\n"
|
|
|
42837f |
if not self.config['batch']:
|
|
|
42837f |
input(prompt)
|
|
|
42837f |
@@ -332,6 +331,7 @@ this utility or remote systems that it connects to.
|
|
|
42837f |
self.config['cluster'].modify_sos_cmd()
|
|
|
42837f |
self.get_nodes()
|
|
|
42837f |
self.intro()
|
|
|
42837f |
+ self.configure_sos_cmd()
|
|
|
42837f |
|
|
|
42837f |
def intro(self):
|
|
|
42837f |
'''Prints initial messages and collects user and case if not
|
|
|
42837f |
--
|
|
|
42837f |
2.14.4
|
|
|
42837f |
|