From de9b9afe09137f30a25406183ce58f99a9047c98 Mon Sep 17 00:00:00 2001 From: jxy_git Date: Wed, 10 Aug 2022 20:59:24 +0800 Subject: [PATCH] Remove OVN/OVS support --- ovirt-engine.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/ovirt-engine.spec b/ovirt-engine.spec index 7ade6f3..5b27aec 100644 --- a/ovirt-engine.spec +++ b/ovirt-engine.spec @@ -176,7 +176,7 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d Name: ovirt-engine Version: 4.4.4.1 -Release: 5 +Release: 6 Summary: Management server for Open Virtualization Group: %{ovirt_product_group} License: Apache 2.0 @@ -300,10 +300,6 @@ Conflicts: python3-ipaserver # Userportal is retired Obsoletes: %{name}-userportal -# OVS/OVN stuff -Requires: python3-pyOpenSSL -Requires: ovirt-provider-ovn >= 1.2.1 - #JavaScript and CSS libraries are currently bundled Provides: bundled(js-jquery) = 3.4.1 Provides: bundled(js-jquery-ui) = 1.12.1 @@ -456,11 +452,6 @@ Conflicts: %{name} < 4.4.0 # See rhbz# 1676461 Requires: ovirt-vmconsole >= 1.0.7 -# OVS/OVN stuff, for firewalld service files -Requires: openvswitch-ovn-central >= 0:2.7 -Conflicts: openvswitch-ovn-central = 1:2.6.1 -Requires: ovirt-provider-ovn >= 1.2.1 - %description setup-plugin-ovirt-engine Setup and upgrade specific plugins for %{ovirt_product_name_short} @@ -969,7 +960,6 @@ fi %postun if [ "$1" -eq 0 ]; then rm -rf "%{engine_cache}" - rm -rf "%{engine_pki}" if [ -f "%{_sysconfdir}/yum/pluginconf.d/versionlock.list" ]; then sed -i '/%{name}/d' "%{_sysconfdir}/yum/pluginconf.d/versionlock.list" @@ -1303,6 +1293,9 @@ fi %{engine_data}/setup/bin/ovirt-engine-health %changelog +* Wed Aug 10 2022 jiangxinyu - 4.4.4.1-6 +- Remove OVN/OVS support + * Fri May 27 2022 yanghuan - 4.4.4.1-5 - Fix CVE-2020-10775 -- Gitee