!86 修复openvswitch-ipsec.servic服务启动失败问题

From: @wu-leilei
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2021-12-03 01:48:05 +00:00 committed by Gitee
commit a52444e94c
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From e17d0df4e0e904ffbd08c1c3518ca1ce984259bf Mon Sep 17 00:00:00 2001
From: wu-leilei <wu18740459704@163.com>
Date: Thu, 2 Dec 2021 17:23:12 +0800
Subject: [PATCH] specifies the ovs module path
---
ipsec/ovs-monitor-ipsec.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in
index 4710be0..73722cf 100755
--- a/ipsec/ovs-monitor-ipsec.in
+++ b/ipsec/ovs-monitor-ipsec.in
@@ -21,6 +21,7 @@ import copy
import os
from string import Template
+sys.path.append("/usr/share/openvswitch/python/")
import ovs.daemon
import ovs.db.idl
import ovs.dirs
--
2.23.0

View File

@ -3,7 +3,7 @@ Summary: Production Quality, Multilayer Open Virtual Switch
URL: http://www.openvswitch.org/
Version: 2.12.0
License: ASL 2.0 and ISC
Release: 14
Release: 15
Source: https://www.openvswitch.org/releases/openvswitch-%{version}.tar.gz
Buildroot: /tmp/openvswitch-rpm
Patch0000: 0000-openvswitch-add-stack-protector-strong.patch
@ -14,6 +14,7 @@ Patch0004: CVE-2020-27827.patch
Patch0005: CVE-2015-8011.patch
Patch0006: backport-CVE-2021-36980.patch
Patch0007: 0002-fix-DPDK-compiling-error.patch
Patch0008: 0001-specifies-the-ovs-module-path.patch
Requires: %{name}-help
Requires: logrotate hostname python >= 2.7 python2-six selinux-policy-targeted libsepol >= 3.1
@ -526,6 +527,9 @@ exit 0
%{_unitdir}/ovn-controller-vtep.service
%changelog
* Thu Dec 02 2021 wulei <wulei80@huawei.com> - 2.12.0-15
- Rectify the failure to start openvswitch-ipesc and ovn-controller-vtep services
* Thu Oct 18 2021 yangcheng <yangcheng87@huawei.com> - 2.12.0-14
- Type:bugfix
- ID:NA