46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From 210b83e1d1164d29b1f6198675b8b596c4af8336 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Alvarez Sanchez <dalvarez@redhat.com>
|
||
|
|
Date: Thu, 20 Jan 2022 12:58:44 +0100
|
||
|
|
Subject: [PATCH] [ovn_central] Account for Red Hat ovn package naming
|
||
|
|
|
||
|
|
Previous ovn packages were 'ovn2xxx' and now they have
|
||
|
|
been renamed to 'ovn-2xxx'. This causes sos tool to not
|
||
|
|
recognize that the packages are installed and it won't
|
||
|
|
collect the relevant data.
|
||
|
|
|
||
|
|
This patch is changing the match to be compatible
|
||
|
|
with the previous and newer naming conventions.
|
||
|
|
|
||
|
|
Signed-off-by: Daniel Alvarez Sanchez <dalvarez@redhat.com>
|
||
|
|
---
|
||
|
|
sos/report/plugins/ovn_central.py | 2 +-
|
||
|
|
sos/report/plugins/ovn_host.py | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/sos/report/plugins/ovn_central.py b/sos/report/plugins/ovn_central.py
|
||
|
|
index ddbf288da..0f947d4c5 100644
|
||
|
|
--- a/sos/report/plugins/ovn_central.py
|
||
|
|
+++ b/sos/report/plugins/ovn_central.py
|
||
|
|
@@ -147,7 +147,7 @@ def setup(self):
|
||
|
|
|
||
|
|
class RedHatOVNCentral(OVNCentral, RedHatPlugin):
|
||
|
|
|
||
|
|
- packages = ('openvswitch-ovn-central', 'ovn2.*-central', )
|
||
|
|
+ packages = ('openvswitch-ovn-central', 'ovn.*-central', )
|
||
|
|
ovn_sbdb_sock_path = '/var/run/openvswitch/ovnsb_db.ctl'
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/sos/report/plugins/ovn_host.py b/sos/report/plugins/ovn_host.py
|
||
|
|
index 78604a15a..25c38cccc 100644
|
||
|
|
--- a/sos/report/plugins/ovn_host.py
|
||
|
|
+++ b/sos/report/plugins/ovn_host.py
|
||
|
|
@@ -55,7 +55,7 @@ def check_enabled(self):
|
||
|
|
|
||
|
|
class RedHatOVNHost(OVNHost, RedHatPlugin):
|
||
|
|
|
||
|
|
- packages = ('openvswitch-ovn-host', 'ovn2.*-host', )
|
||
|
|
+ packages = ('openvswitch-ovn-host', 'ovn.*-host', )
|
||
|
|
|
||
|
|
|
||
|
|
class DebianOVNHost(OVNHost, DebianPlugin, UbuntuPlugin):
|