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