|
 |
fce3c4 |
From 27c61e198f47af7ba5899ff1f50ab3d0e089d5eb Mon Sep 17 00:00:00 2001
|
|
|
fce3c4 |
From: Victor Pickard <vpickard@redhat.com>
|
|
|
fce3c4 |
Date: Tue, 25 Sep 2018 11:04:07 -0400
|
|
|
fce3c4 |
Subject: [PATCH] [opendaylight] Update directory for openDaylight logs
|
|
|
fce3c4 |
|
|
|
fce3c4 |
OpenDaylight karaf logs are now located in:
|
|
|
fce3c4 |
/var/log/containers/opendaylight/karaf/logs, so
|
|
|
fce3c4 |
deprecate the old paths, and update the plugin
|
|
|
fce3c4 |
to get the karaf.log files from new location.
|
|
|
fce3c4 |
|
|
|
fce3c4 |
Resolves: #1438
|
|
|
fce3c4 |
|
|
|
fce3c4 |
Signed-off-by: Victor Pickard <vpickard@redhat.com>
|
|
|
fce3c4 |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
fce3c4 |
---
|
|
|
fce3c4 |
sos/plugins/opendaylight.py | 13 +++++++++++++
|
|
|
fce3c4 |
1 file changed, 13 insertions(+)
|
|
|
fce3c4 |
|
|
|
fce3c4 |
diff --git a/sos/plugins/opendaylight.py b/sos/plugins/opendaylight.py
|
|
|
fce3c4 |
index 07c3d11e..2dcb1b88 100644
|
|
|
fce3c4 |
--- a/sos/plugins/opendaylight.py
|
|
|
fce3c4 |
+++ b/sos/plugins/opendaylight.py
|
|
|
fce3c4 |
@@ -27,14 +27,27 @@ class OpenDaylight(Plugin, RedHatPlugin):
|
|
|
fce3c4 |
])
|
|
|
fce3c4 |
|
|
|
fce3c4 |
if self.get_option("all_logs"):
|
|
|
fce3c4 |
+
|
|
|
fce3c4 |
+ # /var/log/containers/opendaylight/ path is specific to ODL
|
|
|
fce3c4 |
+ # Oxygen-SR3 and earlier versions, and may be removed in a future
|
|
|
fce3c4 |
+ # update.
|
|
|
fce3c4 |
+
|
|
|
fce3c4 |
self.add_copy_spec([
|
|
|
fce3c4 |
"/opt/opendaylight/data/log/",
|
|
|
fce3c4 |
"/var/log/containers/opendaylight/",
|
|
|
fce3c4 |
+ "/var/log/containers/opendaylight/karaf/logs/",
|
|
|
fce3c4 |
])
|
|
|
fce3c4 |
+
|
|
|
fce3c4 |
else:
|
|
|
fce3c4 |
+
|
|
|
fce3c4 |
+ # /var/log/containers/opendaylight/ path is specific to ODL
|
|
|
fce3c4 |
+ # Oxygen-SR3 and earlier versions, and may be removed in a future
|
|
|
fce3c4 |
+ # update.
|
|
|
fce3c4 |
+
|
|
|
fce3c4 |
self.add_copy_spec([
|
|
|
fce3c4 |
"/opt/opendaylight/data/log/*.log*",
|
|
|
fce3c4 |
"/var/log/containers/opendaylight/*.log*",
|
|
|
fce3c4 |
+ "/var/log/containers/opendaylight/karaf/logs/*.log*",
|
|
|
fce3c4 |
])
|
|
|
fce3c4 |
|
|
|
fce3c4 |
self.add_cmd_output("docker logs opendaylight_api")
|
|
|
fce3c4 |
--
|
|
|
fce3c4 |
2.17.2
|
|
|
fce3c4 |
|