sos/SOURCES/sos-bz2226682-ovn-ic-db-fil...

43 lines
1.7 KiB
Diff

From 0af74a8b24ec9dab0ca0089d5b834ab9908173ac Mon Sep 17 00:00:00 2001
From: Periyasamy Palanisamy <pepalani@redhat.com>
Date: Fri, 21 Jul 2023 15:03:01 +0530
Subject: [PATCH] Collect db files for ovn interconnect environment
This updates openshift_ovn plugin to collect ovn db files
when it is running with interconnect configuration.
Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
---
sos/report/plugins/openshift_ovn.py | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py
index 98522b1ed6..d81fc97aae 100644
--- a/sos/report/plugins/openshift_ovn.py
+++ b/sos/report/plugins/openshift_ovn.py
@@ -27,7 +27,13 @@ def setup(self):
"/var/log/openvswitch/libreswan.log",
"/var/log/openvswitch/ovs-monitor-ipsec.log"
])
+ # Collect ovn interconnect specific files if exists.
+ self.add_copy_spec([
+ "/var/lib/ovn-ic/etc/ovnnb_db.db",
+ "/var/lib/ovn-ic/etc/ovnsb_db.db"
+ ])
+ # The ovn cluster/status is not valid anymore for interconnect setup.
self.add_cmd_output([
'ovn-appctl -t /var/run/ovn/ovnnb_db.ctl ' +
'cluster/status OVN_Northbound',
@@ -38,6 +44,10 @@ def setup(self):
'ovs-appctl -t /var/run/ovn/ovn-controller.*.ctl ' +
'ct-zone-list'],
container='ovnkube-node')
+ # Collect ovs ct-zone-list directly on host for interconnect setup.
+ self.add_cmd_output([
+ 'ovs-appctl -t /var/run/ovn-ic/ovn-controller.*.ctl ' +
+ 'ct-zone-list'])
self.add_cmd_output([
'ovs-appctl -t ovs-monitor-ipsec tunnels/show',
'ipsec status',