From fe18cbb7cab633e6abad8659f35c56bfab471f9c Mon Sep 17 00:00:00 2001 From: slin14 Date: Fri, 9 Nov 2018 18:41:37 +0800 Subject: [PATCH] refactor openvswitch Package openvswitch-config is created to install customized config file of openvswitch. Test: Pass build and multi node deploy test. Confirmed the config file in compute node is the same as before. Story: 2003768 Task: 27601 Depends-On: https://review.openstack.org/616776 Change-Id: I004bf349ef13707e7c664cc1b4fd76e72d9c8eac Signed-off-by: slin14 --- centos_iso_image.inc | 1 + centos_pkg_dirs | 1 + .../openvswitch-config/centos/build_srpm.data | 2 + .../centos/openvswitch-config.spec | 41 ++++ networking/openvswitch-config/files/LICENSE | 202 ++++++++++++++++++ .../files/etc_logrotate.d_openvswitch | 25 +++ .../files/ovsdb-server.pmon.conf | 25 +++ .../0004-add-pmon-conf-files.patch | 43 ---- ...ch => 0004-rpm-check-with-condition.patch} | 0 ...-pmds.patch => 0005-enable-mlx-pmds.patch} | 4 +- .../0005-log-rotation-config.patch | 24 --- ...h-fix.patch => 0006-iommu-width-fix.patch} | 6 +- ...mlx5-fix-memory-region-cache-lookup.patch} | 2 +- .../centos/meta_patches/PATCH_ORDER | 10 +- .../centos/patches/log-rotation-config.patch | 29 --- 15 files changed, 307 insertions(+), 108 deletions(-) create mode 100644 networking/openvswitch-config/centos/build_srpm.data create mode 100644 networking/openvswitch-config/centos/openvswitch-config.spec create mode 100644 networking/openvswitch-config/files/LICENSE create mode 100644 networking/openvswitch-config/files/etc_logrotate.d_openvswitch create mode 100644 networking/openvswitch-config/files/ovsdb-server.pmon.conf delete mode 100644 networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch rename networking/openvswitch/centos/meta_patches/{0006-rpm-check-with-condition.patch => 0004-rpm-check-with-condition.patch} (100%) rename networking/openvswitch/centos/meta_patches/{0007-enable-mlx-pmds.patch => 0005-enable-mlx-pmds.patch} (94%) delete mode 100644 networking/openvswitch/centos/meta_patches/0005-log-rotation-config.patch rename networking/openvswitch/centos/meta_patches/{0008-iommu-width-fix.patch => 0006-iommu-width-fix.patch} (81%) rename networking/openvswitch/centos/meta_patches/{0009-net-mlx5-fix-memory-region-cache-lookup.patch => 0007-net-mlx5-fix-memory-region-cache-lookup.patch} (92%) delete mode 100644 networking/openvswitch/centos/patches/log-rotation-config.patch diff --git a/centos_iso_image.inc b/centos_iso_image.inc index e6bb577ed..eaf55faf5 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -240,6 +240,7 @@ openldap-clients # openvswitch openvswitch +openvswitch-config # libevent libevent diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 14019e62b..3fd0caef5 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -39,6 +39,7 @@ base/net-snmp ldap/openldap networking/mellanox/mlx4-config networking/openvswitch +networking/openvswitch-config base/libevent security/wrs-ssl security/tss2 diff --git a/networking/openvswitch-config/centos/build_srpm.data b/networking/openvswitch-config/centos/build_srpm.data new file mode 100644 index 000000000..da1e20bd8 --- /dev/null +++ b/networking/openvswitch-config/centos/build_srpm.data @@ -0,0 +1,2 @@ +SRC_DIR="files" +TIS_PATCH_VER=0 diff --git a/networking/openvswitch-config/centos/openvswitch-config.spec b/networking/openvswitch-config/centos/openvswitch-config.spec new file mode 100644 index 000000000..d4fcf18c5 --- /dev/null +++ b/networking/openvswitch-config/centos/openvswitch-config.spec @@ -0,0 +1,41 @@ +Summary: StarlingX openvswitch Configuration File +Name: openvswitch-config +Version: 1.0 +Release: %{tis_patch_ver}%{?_tis_dist} +License: Apache-2.0 +Group: config-files +Packager: StarlingX +URL: unknown +Source: %name-%version.tar.gz + +BuildArch: noarch +Requires: openvswitch + +%define debug_package %{nil} + +%description +StarlingX openvswitch configuration file + +%prep + +%setup + +%build + +%install +install -d -m 0755 %{buildroot}%{_sysconfdir}/openvswitch +install -m 0644 ovsdb-server.pmon.conf %{buildroot}%{_sysconfdir}/openvswitch/ovsdb-server.pmon.conf +install -d %{buildroot}%{_datadir}/starlingx +install -m 0640 etc_logrotate.d_openvswitch %{buildroot}%{_datadir}/starlingx/etc_logrotate.d_openvswitch + +%post +if [ $1 -eq 1 ] ; then + cp -f %{_datadir}/starlingx/etc_logrotate.d_openvswitch %{_sysconfdir}/logrotate.d/openvswitch + chmod 644 %{_sysconfdir}/logrotate.d/openvswitch +fi + +%files +%defattr(-,root,root) +%license LICENSE +%config(noreplace) %{_sysconfdir}/openvswitch/ovsdb-server.pmon.conf +%{_datadir}/starlingx/etc_logrotate.d_openvswitch diff --git a/networking/openvswitch-config/files/LICENSE b/networking/openvswitch-config/files/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/networking/openvswitch-config/files/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/networking/openvswitch-config/files/etc_logrotate.d_openvswitch b/networking/openvswitch-config/files/etc_logrotate.d_openvswitch new file mode 100644 index 000000000..f9ae766e5 --- /dev/null +++ b/networking/openvswitch-config/files/etc_logrotate.d_openvswitch @@ -0,0 +1,25 @@ +# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc. +# +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without warranty of any kind. + +/var/log/openvswitch/*.log { + nodateext + size 10M + start 1 + rotate 20 + notifempty + compress + sharedscripts + missingok + postrotate + # Tell Open vSwitch daemons to reopen their log files + if [ -d /var/run/openvswitch ]; then + for ctl in /var/run/openvswitch/*.ctl; do + ovs-appctl -t "$ctl" vlog/reopen 2>/dev/null || : + done + fi + endscript +} diff --git a/networking/openvswitch-config/files/ovsdb-server.pmon.conf b/networking/openvswitch-config/files/ovsdb-server.pmon.conf new file mode 100644 index 000000000..d357c44c8 --- /dev/null +++ b/networking/openvswitch-config/files/ovsdb-server.pmon.conf @@ -0,0 +1,25 @@ +[process] +process = ovsdb-server +service = ovsdb-server ; The name of the process's systemd service file without the extension +pidfile = /var/run/openvswitch/ovsdb-server.pid +style = lsb ; ocf or lsb +severity = critical ; minor, major, critical +restarts = 3 ; restarts before error assertion +interval = 5 ; number of seconds to wait between restarts +debounce = 20 ; number of seconds that a process needs to remain + ; running before degrade is removed and retry count + ; is cleared. +startuptime = 5 ; Seconds to wait after process start before starting the debounce monitor +mode = passive ; Monitoring mode: passive (default) or active + ; passive: process death monitoring (default: always) + ; active : heartbeat monitoring, i.e. request / response messaging + ; ignore : do not monitor or stop monitoring +subfunction = compute ; Optional label. + ; Manage this process in the context of a combo host subfunction + ; Choices: compute or storage. + ; when specified pmond will wait for + ; /var/run/.compute_config_complete or + ; /var/run/.storage_config_complete + ; ... before managing this process with the specified subfunction + ; Excluding this label will cause this process to be managed by default on startup + diff --git a/networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch b/networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch deleted file mode 100644 index 7aa75c2d2..000000000 --- a/networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4f7df3882496e1df40de57824d2c4811750d2405 Mon Sep 17 00:00:00 2001 -From: Matt Peters -Date: Fri, 1 Jun 2018 19:49:33 -0500 -Subject: [PATCH] add pmon conf files - ---- - SPECS/openvswitch.spec | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec -index b1e285d..16447e0 100644 ---- a/SPECS/openvswitch.spec -+++ b/SPECS/openvswitch.spec -@@ -76,6 +76,9 @@ Source504: arm64-armv8a-linuxapp-gcc-config - Source505: ppc_64-power8-linuxapp-gcc-config - Source506: x86_64-native-linuxapp-gcc-config - -+Source600: ovsdb-server.pmon.conf -+ -+ - # The DPDK is designed to optimize througput of network traffic using, among - # other techniques, carefully crafted assembly instructions. As such it - # needs extensive work to port it to other architectures. -@@ -430,6 +433,8 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf - %endif - %endif - -+install -m 0644 %{SOURCE600} $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/ovsdb-server.pmon.conf -+ - # remove unpackaged files - rm -f $RPM_BUILD_ROOT/%{_bindir}/ovs-benchmark \ - $RPM_BUILD_ROOT/%{_bindir}/ovs-docker \ -@@ -632,6 +637,7 @@ rm -rf $RPM_BUILD_ROOT - %{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash - %{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash - %config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch -+%{_sysconfdir}/openvswitch/ovsdb-server.pmon.conf - %{_unitdir}/openvswitch.service - %{_unitdir}/ovsdb-server.service - %{_unitdir}/ovs-vswitchd.service --- -2.7.4 - diff --git a/networking/openvswitch/centos/meta_patches/0006-rpm-check-with-condition.patch b/networking/openvswitch/centos/meta_patches/0004-rpm-check-with-condition.patch similarity index 100% rename from networking/openvswitch/centos/meta_patches/0006-rpm-check-with-condition.patch rename to networking/openvswitch/centos/meta_patches/0004-rpm-check-with-condition.patch diff --git a/networking/openvswitch/centos/meta_patches/0007-enable-mlx-pmds.patch b/networking/openvswitch/centos/meta_patches/0005-enable-mlx-pmds.patch similarity index 94% rename from networking/openvswitch/centos/meta_patches/0007-enable-mlx-pmds.patch rename to networking/openvswitch/centos/meta_patches/0005-enable-mlx-pmds.patch index a20174ede..621aa9e84 100644 --- a/networking/openvswitch/centos/meta_patches/0007-enable-mlx-pmds.patch +++ b/networking/openvswitch/centos/meta_patches/0005-enable-mlx-pmds.patch @@ -21,7 +21,7 @@ diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec index 29255d5..f392e95 100644 --- a/SPECS/openvswitch.spec +++ b/SPECS/openvswitch.spec -@@ -155,6 +155,7 @@ BuildRequires: libcap-ng libcap-ng-devel +@@ -151,6 +151,7 @@ BuildRequires: libcap-ng libcap-ng-devel %ifarch %{dpdkarches} # DPDK driver dependencies BuildRequires: zlib-devel libpcap-devel numactl-devel @@ -29,7 +29,7 @@ index 29255d5..f392e95 100644 Requires: python-pyelftools # Virtual provide for depending on DPDK-enabled OVS -@@ -356,7 +357,12 @@ cd - +@@ -352,7 +353,12 @@ cd - --dpdk \ < rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \ > rhel/usr_lib_systemd_system_ovs-vswitchd.service diff --git a/networking/openvswitch/centos/meta_patches/0005-log-rotation-config.patch b/networking/openvswitch/centos/meta_patches/0005-log-rotation-config.patch deleted file mode 100644 index e22f5800b..000000000 --- a/networking/openvswitch/centos/meta_patches/0005-log-rotation-config.patch +++ /dev/null @@ -1,24 +0,0 @@ -From babffcf0f064379438fabcd00329bd431413e28a Mon Sep 17 00:00:00 2001 -From: Matt Peters -Date: Fri, 1 Jun 2018 20:13:57 -0500 -Subject: [PATCH] log rotation config - ---- - SPECS/openvswitch.spec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec -index ff5694a..c51d53f 100644 ---- a/SPECS/openvswitch.spec -+++ b/SPECS/openvswitch.spec -@@ -107,6 +107,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x - - # ovs-patches - Patch01: run-services-as-root-user.patch -+Patch02: log-rotation-config.patch - - # OVS (including OVN) backports (0 - 300) - --- -1.8.3.1 - diff --git a/networking/openvswitch/centos/meta_patches/0008-iommu-width-fix.patch b/networking/openvswitch/centos/meta_patches/0006-iommu-width-fix.patch similarity index 81% rename from networking/openvswitch/centos/meta_patches/0008-iommu-width-fix.patch rename to networking/openvswitch/centos/meta_patches/0006-iommu-width-fix.patch index b0656546b..9e616fa5e 100644 --- a/networking/openvswitch/centos/meta_patches/0008-iommu-width-fix.patch +++ b/networking/openvswitch/centos/meta_patches/0006-iommu-width-fix.patch @@ -12,11 +12,11 @@ diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec index 29255d5..a3a1c87 100644 --- a/SPECS/openvswitch.spec +++ b/SPECS/openvswitch.spec -@@ -108,6 +108,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x +@@ -104,6 +104,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x + # ovs-patches Patch01: run-services-as-root-user.patch - Patch02: log-rotation-config.patch -+Patch03: iommu-width-fix.patch ++Patch02: iommu-width-fix.patch # OVS (including OVN) backports (0 - 300) diff --git a/networking/openvswitch/centos/meta_patches/0009-net-mlx5-fix-memory-region-cache-lookup.patch b/networking/openvswitch/centos/meta_patches/0007-net-mlx5-fix-memory-region-cache-lookup.patch similarity index 92% rename from networking/openvswitch/centos/meta_patches/0009-net-mlx5-fix-memory-region-cache-lookup.patch rename to networking/openvswitch/centos/meta_patches/0007-net-mlx5-fix-memory-region-cache-lookup.patch index 38903a5be..a65013114 100644 --- a/networking/openvswitch/centos/meta_patches/0009-net-mlx5-fix-memory-region-cache-lookup.patch +++ b/networking/openvswitch/centos/meta_patches/0007-net-mlx5-fix-memory-region-cache-lookup.patch @@ -11,7 +11,7 @@ diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec index f286a13..6d95f35 100644 --- a/SPECS/openvswitch.spec +++ b/SPECS/openvswitch.spec -@@ -127,7 +127,7 @@ Patch422: 0003-vhost-extract-virtqueue-cleaning-and-freeing-functio.patch +@@ -123,7 +123,7 @@ Patch422: 0003-vhost-extract-virtqueue-cleaning-and-freeing-functio.patch Patch423: 0004-vhost-destroy-unused-virtqueues-when-multiqueue-not-.patch Patch424: 0005-vhost-add-flag-for-built-in-virtio-driver.patch Patch425: 0006-vhost-drop-virtqueues-only-with-built-in-virtio-driv.patch diff --git a/networking/openvswitch/centos/meta_patches/PATCH_ORDER b/networking/openvswitch/centos/meta_patches/PATCH_ORDER index 25e25de51..1f219ff38 100644 --- a/networking/openvswitch/centos/meta_patches/PATCH_ORDER +++ b/networking/openvswitch/centos/meta_patches/PATCH_ORDER @@ -1,9 +1,7 @@ 0001-update-package-versioning-for-TIS-format.patch 0002-dpdk-usertools.patch 0003-run-services-as-root-user.patch -0004-add-pmon-conf-files.patch -0005-log-rotation-config.patch -0006-rpm-check-with-condition.patch -0007-enable-mlx-pmds.patch -0008-iommu-width-fix.patch -0009-net-mlx5-fix-memory-region-cache-lookup.patch +0004-rpm-check-with-condition.patch +0005-enable-mlx-pmds.patch +0006-iommu-width-fix.patch +0007-net-mlx5-fix-memory-region-cache-lookup.patch diff --git a/networking/openvswitch/centos/patches/log-rotation-config.patch b/networking/openvswitch/centos/patches/log-rotation-config.patch deleted file mode 100644 index 20e10bf47..000000000 --- a/networking/openvswitch/centos/patches/log-rotation-config.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 97cd48cae1ac9b431747211dbaf59c304bf93293 Mon Sep 17 00:00:00 2001 -From: Matt Peters -Date: Fri, 1 Jun 2018 20:17:47 -0500 -Subject: [PATCH] log rotation config - ---- - rhel/etc_logrotate.d_openvswitch | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/rhel/etc_logrotate.d_openvswitch b/rhel/etc_logrotate.d_openvswitch -index ed7d733..f9ae766 100644 ---- a/rhel/etc_logrotate.d_openvswitch -+++ b/rhel/etc_logrotate.d_openvswitch -@@ -6,7 +6,11 @@ - # without warranty of any kind. - - /var/log/openvswitch/*.log { -- daily -+ nodateext -+ size 10M -+ start 1 -+ rotate 20 -+ notifempty - compress - sharedscripts - missingok --- -1.8.3.1 -