diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0004-restore-ovs-service-parameters.patch b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0004-restore-ovs-service-parameters.patch new file mode 100644 index 000000000..b4eb6151e --- /dev/null +++ b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0004-restore-ovs-service-parameters.patch @@ -0,0 +1,32 @@ +From edf5db0a419f65350f6628cc74f144f8fd26e45d Mon Sep 17 00:00:00 2001 +From: Matt Peters +Date: Fri, 18 May 2018 13:35:03 -0500 +Subject: [PATCH] restore ovs service parameters + +--- + SPECS/puppet-neutron.spec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SPECS/puppet-neutron.spec b/SPECS/puppet-neutron.spec +index 58bbd24..831d61b 100644 +--- a/SPECS/puppet-neutron.spec ++++ b/SPECS/puppet-neutron.spec +@@ -17,6 +17,7 @@ Patch0006: 0006-Add-parameters-to-classes.patch + Patch0007: 0007-update-neutron-bgp-to-use-class-variables.patch + Patch0008: 0008-dvr-allow-base-mac-address-to-be-configured.patch + Patch0009: 0009-add-support-for-networking-sfc.patch ++Patch0010: 0010-restore-ovs-service-parameters.patch + + BuildArch: noarch + +@@ -44,6 +45,7 @@ Puppet module for OpenStack Neutron + %patch0007 -p1 + %patch0008 -p1 + %patch0009 -p1 ++%patch0010 -p1 + + find . -type f -name ".*" -exec rm {} + + find . -size 0 -exec rm {} + +-- +1.8.3.1 + diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0005-unset-tunnel_types-when-tunnelling-disabled.patch b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0005-unset-tunnel_types-when-tunnelling-disabled.patch new file mode 100644 index 000000000..e9e362d39 --- /dev/null +++ b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0005-unset-tunnel_types-when-tunnelling-disabled.patch @@ -0,0 +1,32 @@ +From c4b5fbe5505de3e673eb2e0b04ce65f9efc9b146 Mon Sep 17 00:00:00 2001 +From: Matt Peters +Date: Sat, 26 May 2018 09:05:10 -0500 +Subject: [PATCH] unset tunnel_types when tunnelling disabled + +--- + SPECS/puppet-neutron.spec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SPECS/puppet-neutron.spec b/SPECS/puppet-neutron.spec +index 831d61b..0db2869 100644 +--- a/SPECS/puppet-neutron.spec ++++ b/SPECS/puppet-neutron.spec +@@ -18,6 +18,7 @@ Patch0007: 0007-update-neutron-bgp-to-use-class-variables.patch + Patch0008: 0008-dvr-allow-base-mac-address-to-be-configured.patch + Patch0009: 0009-add-support-for-networking-sfc.patch + Patch0010: 0010-restore-ovs-service-parameters.patch ++Patch0011: 0011-unset-tunnel_types-when-tunneling-disabled.patch + + BuildArch: noarch + +@@ -46,6 +47,7 @@ Puppet module for OpenStack Neutron + %patch0008 -p1 + %patch0009 -p1 + %patch0010 -p1 ++%patch0011 -p1 + + find . -type f -name ".*" -exec rm {} + + find . -size 0 -exec rm {} + +-- +1.8.3.1 + diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER index ada94f815..e732cf99d 100644 --- a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER +++ b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER @@ -1,3 +1,5 @@ 0001-Update-package-versioning-for-TIS-format.patch 0002-Add-TiS-patches.patch 0003-add-support-for-networking-sfc.patch +0004-restore-ovs-service-parameters.patch +0005-unset-tunnel_types-when-tunnelling-disabled.patch diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0010-restore-ovs-service-parameters.patch b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0010-restore-ovs-service-parameters.patch new file mode 100644 index 000000000..2bc8bd41e --- /dev/null +++ b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0010-restore-ovs-service-parameters.patch @@ -0,0 +1,46 @@ +From dc4b592359fd30045797c26f3d9a99e191a932cc Mon Sep 17 00:00:00 2001 +From: Matt Peters +Date: Fri, 1 Jun 2018 20:26:20 -0500 +Subject: [PATCH] 0010-restore-ovs-service-parameters.patch + +--- + manifests/params.pp | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/manifests/params.pp b/manifests/params.pp +index 858e3fa..22320e5 100644 +--- a/manifests/params.pp ++++ b/manifests/params.pp +@@ -7,7 +7,7 @@ class neutron::params { + + $client_package = 'python-neutronclient' + $server_service = 'neutron-server' +- #$ovs_agent_service = 'neutron-openvswitch-agent' ++ $ovs_agent_service = 'neutron-openvswitch-agent' + #$linuxbridge_agent_service = 'neutron-linuxbridge-agent' + #$cisco_config_file = '/etc/neutron/plugins/cisco/cisco_plugins.ini' + $opencontrail_plugin_package = 'neutron-plugin-contrail' +@@ -37,7 +37,6 @@ class neutron::params { + $l2gw_agent_service = 'neutron-l2gw-agent' + $nsx_plugin_package = 'vmware-nsx' + $nsx_config_file = '/etc/neutron/plugins/vmware/nsx.ini' +- $vswitch_agent_service = '' + $router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.HostBasedScheduler' + $network_scheduler_driver = 'neutron.scheduler.dhcp_agent_scheduler.HostBasedScheduler' + $router_status_managed = true +@@ -50,9 +49,9 @@ class neutron::params { + $server_package = false + #$ml2_server_package = 'openstack-neutron-ml2' + $ml2_server_package = false +- #$ovs_agent_package = false +- #$ovs_server_package = 'openstack-neutron-openvswitch' +- #$ovs_cleanup_service = 'neutron-ovs-cleanup' ++ $ovs_agent_package = false ++ $ovs_server_package = 'openstack-neutron-openvswitch' ++ $ovs_cleanup_service = 'neutron-ovs-cleanup' + #$libnl_package = 'libnl' + #$package_provider = 'rpm' + #$linuxbridge_agent_package = false +-- +1.8.3.1 + diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0011-unset-tunnel_types-when-tunneling-disabled.patch b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0011-unset-tunnel_types-when-tunneling-disabled.patch new file mode 100644 index 000000000..0666daa5b --- /dev/null +++ b/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0011-unset-tunnel_types-when-tunneling-disabled.patch @@ -0,0 +1,24 @@ +From efc8886902108994a799ab4bf7c5a8ddec0c0a8b Mon Sep 17 00:00:00 2001 +From: Matt Peters +Date: Sat, 26 May 2018 09:02:35 -0500 +Subject: [PATCH] unset tunnel_types when tunneling disabled + +--- + manifests/agents/ml2/ovs.pp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp +index a10c7b5..f7c19c2 100644 +--- a/manifests/agents/ml2/ovs.pp ++++ b/manifests/agents/ml2/ovs.pp +@@ -310,6 +310,7 @@ class neutron::agents::ml2::ovs ( + 'ovs/local_ip': ensure => absent; + 'ovs/int_peer_patch_port': ensure => absent; + 'ovs/tun_peer_patch_port': ensure => absent; ++ 'agent/tunnel_types': ensure => absent; + } + } + +-- +1.8.3.1 + diff --git a/networking/openvswitch/centos/build_srpm.data b/networking/openvswitch/centos/build_srpm.data index f1c5fba8b..6e36f5d7f 100644 --- a/networking/openvswitch/centos/build_srpm.data +++ b/networking/openvswitch/centos/build_srpm.data @@ -1,4 +1,3 @@ -COPY_LIST="$CGCS_BASE/downloads/openvswitch-2.8.1.tar.gz \ - $CGCS_BASE/downloads/dpdk-17.05.2.tar.gz \ - patches/*" -TIS_PATCH_VER=1 +COPY_LIST="files/*" +TIS_PATCH_VER=0 +BUILD_IS_SLOW=12 diff --git a/networking/openvswitch/centos/meta_patches/0001-update-package-versioning-for-TIS-format.patch b/networking/openvswitch/centos/meta_patches/0001-update-package-versioning-for-TIS-format.patch new file mode 100644 index 000000000..04cd04bd4 --- /dev/null +++ b/networking/openvswitch/centos/meta_patches/0001-update-package-versioning-for-TIS-format.patch @@ -0,0 +1,25 @@ +From cfa7930a4bf0b0e798f1492cd75e37f66c1f5319 Mon Sep 17 00:00:00 2001 +From: Matt Peters +Date: Mon, 28 May 2018 08:14:24 -0500 +Subject: [PATCH] update package versioning for TIS format + +--- + SPECS/openvswitch.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec +index e007992..71b4634 100644 +--- a/SPECS/openvswitch.spec ++++ b/SPECS/openvswitch.spec +@@ -46,7 +46,7 @@ URL: http://www.openvswitch.org/ + # Carried over from 2.6.1 CBS builds, introduced to win over 2.6.90 + Epoch: 1 + Version: 2.9.0 +-Release: 3%{?commit0:.%{date}git%{shortcommit0}}%{?dist} ++Release: 3.el7%{?_tis_dist}.%{tis_patch_ver} + + # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the + # lib/sflow*.[ch] files are SISSL +-- +1.8.3.1 + diff --git a/networking/openvswitch/centos/meta_patches/0002-dpdk-usertools.patch b/networking/openvswitch/centos/meta_patches/0002-dpdk-usertools.patch new file mode 100644 index 000000000..fb52f742c --- /dev/null +++ b/networking/openvswitch/centos/meta_patches/0002-dpdk-usertools.patch @@ -0,0 +1,48 @@ +From f1173c242506fb5d1b311efe2f7d657b04ae6b24 Mon Sep 17 00:00:00 2001 +From: Matt Peters +Date: Fri, 15 Jun 2018 13:37:14 -0500 +Subject: [PATCH] dpdk usertools + +--- + SPECS/openvswitch.spec | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec +index 71b4634..22bdec9 100644 +--- a/SPECS/openvswitch.spec ++++ b/SPECS/openvswitch.spec +@@ -150,6 +150,7 @@ BuildRequires: libcap-ng libcap-ng-devel + %ifarch %{dpdkarches} + # DPDK driver dependencies + BuildRequires: zlib-devel libpcap-devel numactl-devel ++Requires: python-pyelftools + + # Virtual provide for depending on DPDK-enabled OVS + Provides: openvswitch-dpdk = %{version}-%{release} +@@ -421,6 +422,13 @@ install -p -D -m 0755 \ + touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/conf.db + touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf + ++%if %{with dpdk} ++%ifarch %{dpdkarches} ++ install -m 0755 %{dpdkdir}-%{dpdkver}/usertools/dpdk-pmdinfo.py $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/dpdk-pmdinfo.py ++ install -m 0755 %{dpdkdir}-%{dpdkver}/usertools/dpdk-devbind.py $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/dpdk-devbind.py ++%endif ++%endif ++ + # remove unpackaged files + rm -f $RPM_BUILD_ROOT/%{_bindir}/ovs-benchmark \ + $RPM_BUILD_ROOT/%{_bindir}/ovs-docker \ +@@ -656,6 +664,9 @@ fi + %{_datadir}/openvswitch/scripts/ovs-vtep + %{_datadir}/openvswitch/scripts/ovs-ctl + %{_datadir}/openvswitch/scripts/ovs-systemd-reload ++%{_datadir}/openvswitch/scripts/dpdk-pmdinfo.py ++%{_datadir}/openvswitch/scripts/dpdk-devbind.py ++%exclude %{_datadir}/openvswitch/scripts/*.py[oc] + %config %{_datadir}/openvswitch/vswitch.ovsschema + %config %{_datadir}/openvswitch/vtep.ovsschema + %{_bindir}/ovs-appctl +-- +1.8.3.1 + diff --git a/networking/openvswitch/centos/meta_patches/0003-run-services-as-root-user.patch b/networking/openvswitch/centos/meta_patches/0003-run-services-as-root-user.patch new file mode 100644 index 000000000..867568911 --- /dev/null +++ b/networking/openvswitch/centos/meta_patches/0003-run-services-as-root-user.patch @@ -0,0 +1,49 @@ +From 45378c59ffd64d2cf17aa2944489075e6940ab39 Mon Sep 17 00:00:00 2001 +From: Matt Peters +Date: Tue, 29 May 2018 11:58:36 -0500 +Subject: [PATCH] 0003-run-services-as-root-user.patch + +--- + SPECS/openvswitch.spec | 19 +------------------ + 1 file changed, 1 insertion(+), 18 deletions(-) + +diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec +index 6950479..6fc2b67 100644 +--- a/SPECS/openvswitch.spec ++++ b/SPECS/openvswitch.spec +@@ -103,6 +103,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x + %define dpdktarget %{dpdk_mach_arch}-%{dpdk_mach_tmpl}-linuxapp-gcc + + # ovs-patches ++Patch01: run-services-as-root-user.patch + + # OVS (including OVN) backports (0 - 300) + +@@ -507,24 +508,6 @@ rm -rf $RPM_BUILD_ROOT + fi + %endif + +-%post +-if [ $1 -eq 1 ]; then +- getent passwd openvswitch >/dev/null || \ +- useradd -r -d / -s /sbin/nologin -c "Open vSwitch Daemons" openvswitch +- +- sed -i 's:^#OVS_USER_ID=:OVS_USER_ID=:' /etc/sysconfig/openvswitch +- +- getent group hugetlbfs >/dev/null || \ +- groupadd hugetlbfs +- usermod -a -G hugetlbfs openvswitch +- sed -i \ +- 's@OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:hugetlbfs"@'\ +- /etc/sysconfig/openvswitch +- +- # In the case of upgrade, this is not needed. +- chown -R openvswitch:openvswitch /etc/openvswitch +-fi +- + %if 0%{?systemd_post:1} + %systemd_post %{name}.service + %else +-- +1.8.3.1 + 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 new file mode 100644 index 000000000..6fe0dbbc7 --- /dev/null +++ b/networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch @@ -0,0 +1,42 @@ +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 | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec +index 6fc2b67..57a3055 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. +@@ -429,6 +432,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 \ +@@ -631,6 +636,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 +1.8.3.1 + diff --git a/networking/openvswitch/centos/meta_patches/0005-log-rotation-config.patch b/networking/openvswitch/centos/meta_patches/0005-log-rotation-config.patch new file mode 100644 index 000000000..e22f5800b --- /dev/null +++ b/networking/openvswitch/centos/meta_patches/0005-log-rotation-config.patch @@ -0,0 +1,24 @@ +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/0006-rpm-check-with-condition.patch b/networking/openvswitch/centos/meta_patches/0006-rpm-check-with-condition.patch new file mode 100644 index 000000000..c6f6407a7 --- /dev/null +++ b/networking/openvswitch/centos/meta_patches/0006-rpm-check-with-condition.patch @@ -0,0 +1,25 @@ +From 39471b1f12131cfa74e272e73c38eb830d89f1bd Mon Sep 17 00:00:00 2001 +From: Matt Peters +Date: Tue, 12 Jun 2018 14:41:25 -0500 +Subject: [PATCH] rpm check with condition + +--- + SPECS/openvswitch.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec +index c51d53f..432c9ed 100644 +--- a/SPECS/openvswitch.spec ++++ b/SPECS/openvswitch.spec +@@ -25,7 +25,7 @@ + # https://bugzilla.redhat.com/show_bug.cgi?id=1105458#c10 + # "ofproto-dpif - select group with dp_hash selection method" test is broken on armv7lh + %ifarch x86_64 aarch64 ppc64le +-%bcond_without check ++%bcond_with check + %else + %bcond_with check + %endif +-- +1.8.3.1 + diff --git a/networking/openvswitch/centos/meta_patches/PATCH_ORDER b/networking/openvswitch/centos/meta_patches/PATCH_ORDER new file mode 100644 index 000000000..12dcf854c --- /dev/null +++ b/networking/openvswitch/centos/meta_patches/PATCH_ORDER @@ -0,0 +1,6 @@ +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 diff --git a/networking/openvswitch/centos/openvswitch.spec b/networking/openvswitch/centos/openvswitch.spec deleted file mode 100644 index 266b7fdb8..000000000 --- a/networking/openvswitch/centos/openvswitch.spec +++ /dev/null @@ -1,1009 +0,0 @@ -# Uncomment these for snapshot releases: -# snapshot is the date YYYYMMDD of the snapshot -# snap_git is the 8 git sha digits of the last commit -# Use ovs-snapshot.sh to create the tarball. -#% define snapshot .git20150730 -#% define snap_gitsha -git72bfa562 - -# If wants to run tests while building, specify the '--with check' -# option. For example: -# rpmbuild -bb --with check openvswitch.spec - -# To disable DPDK support, specify '--without dpdk' when building -%bcond_without dpdk -%bcond_without dpdkstatic - -# test-suite is broken for big endians -# https://bugzilla.redhat.com/show_bug.cgi?id=1105458#c10 -# "ofproto-dpif - select group with dp_hash selection method" test is broken on arm -%ifnarch ppc ppc64 ppc64p7 s390 s390x armv7hl -# wordaround(LLU) - 'make check' failed in mockchain environment, but succeeded in mock, -# needs to investigate why -%bcond_with check -%else -%bcond_with check -%endif - -# option to build with libcap-ng, needed for running OVS as regular user -%bcond_without libcapng - -# Enable PIE, bz#955181 -%global _hardened_build 1 - -%define dpdkver 17.05.2 -%define dpdkdir dpdk-stable -%define dpdksver %(echo %{dpdkver} | cut -d. -f-2) - -Name: openvswitch -Version: 2.8.1 -Release: 3%{?_tis_dist}.%{tis_patch_ver} -Summary: Open vSwitch daemon/database/utilities - -# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the -# lib/sflow*.[ch] files are SISSL -# datapath/ is GPLv2 (although not built into any of the binary packages) -License: ASL 2.0 and LGPLv2+ and SISSL -URL: http://openvswitch.org -Source0: http://openvswitch.org/releases/%{name}-%{version}%{?snap_gitsha}.tar.gz -Source1: http://fast.dpdk.org/rel/dpdk-%{dpdkver}.tar.gz -#Source2: ovs-snapshot.sh - -%if %{with dpdk} -Patch1: ovs-vswitchd.system.service.patch -%endif - -%if %{with dpdk} -%define dpdkarches x86_64 i686 aarch64 ppc64le - -# machine_arch maps between rpm and dpdk arch name, often same as _target_cpu -# machine_tmpl is the config template machine name, often "native" -# machine is the actual machine name used in the dpdk make system -%ifarch x86_64 -%define machine_arch x86_64 -%define machine_tmpl native -%define machine default -%endif -%ifarch i686 -%define machine_arch i686 -%define machine_tmpl native -%define machine atm -%endif -%ifarch aarch64 -%define machine_arch arm64 -%define machine_tmpl armv8a -%define machine armv8a -%endif -%ifarch ppc64le -%define machine_arch ppc_64 -%define machine_tmpl power8 -%define machine power8 -%endif - -%define dpdktarget %{machine_arch}-%{machine_tmpl}-linuxapp-gcc -%endif -ExcludeArch: ppc - -BuildRequires: python-sphinx -BuildRequires: autoconf automake libtool -BuildRequires: systemd-units openssl openssl-devel -BuildRequires: python2-devel python2-six -BuildRequires: desktop-file-utils -BuildRequires: groff graphviz -# make check dependencies -%if %{with check} -BuildRequires: python2-twisted python-zope-interface -BuildRequires: procps-ng -%endif -%if %{with dpdk} -%ifarch %{dpdkarches} -# DPDK driver dependencies -%if %{with dpdkstatic} -BuildRequires: libpcap-devel numactl-devel -%else -BuildRequires: libpcap-devel numactl-devel dpdk-devel -%endif -%endif -%endif - -%if %{with libcapng} -BuildRequires: libcap-ng libcap-ng-devel -%endif - -Requires: openssl iproute module-init-tools -#Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3 -#Requires: kernel >= 3.15.0-0 -%if %{with dpdk} -%ifarch %{dpdkarches} -%if %{with dpdkstatic} -%else -Requires: dpdk -%endif -%endif -%endif - -Requires(post): /usr/bin/getent -Requires(post): /usr/sbin/useradd -Requires(post): /bin/sed -Requires(post): /usr/sbin/usermod -Requires(post): /usr/sbin/groupadd -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -Obsoletes: openvswitch-controller <= 0:2.1.0-1 - -%description -Open vSwitch provides standard network bridging functions and -support for the OpenFlow protocol for remote per-flow control of -traffic. - -%package -n python2-openvswitch -Summary: Open vSwitch python2 bindings -License: ASL 2.0 -BuildArch: noarch -Requires: python2 python2-six -Obsoletes: python-openvswitch < 2.6.1-2 -Provides: python-openvswitch = %{version}-%{release} - -%description -n python2-openvswitch -Python bindings for the Open vSwitch database - -%package test -Summary: Open vSwitch testing utilities -License: ASL 2.0 -BuildArch: noarch -Requires: python2-openvswitch = %{version}-%{release} -Requires: python2 python2-twisted - -%description test -Utilities that are useful to diagnose performance and connectivity -issues in Open vSwitch setup. - -%package devel -Summary: Open vSwitch OpenFlow development package (library, headers) -License: ASL 2.0 -Provides: openvswitch-static = %{version}-%{release} - -%description devel -This provides static library, libopenswitch.a and the openvswitch header -files needed to build an external application. - -%package ovn-central -Summary: Open vSwitch - Open Virtual Network support -License: ASL 2.0 -Requires: openvswitch openvswitch-ovn-common -Requires: firewalld-filesystem - -%description ovn-central -OVN, the Open Virtual Network, is a system to support virtual network -abstraction. OVN complements the existing capabilities of OVS to add -native support for virtual network abstractions, such as virtual L2 and L3 -overlays and security groups. - -%package ovn-host -Summary: Open vSwitch - Open Virtual Network support -License: ASL 2.0 -Requires: openvswitch openvswitch-ovn-common -Requires: firewalld-filesystem - -%description ovn-host -OVN, the Open Virtual Network, is a system to support virtual network -abstraction. OVN complements the existing capabilities of OVS to add -native support for virtual network abstractions, such as virtual L2 and L3 -overlays and security groups. - -%package ovn-vtep -Summary: Open vSwitch - Open Virtual Network support -License: ASL 2.0 -Requires: openvswitch openvswitch-ovn-common - -%description ovn-vtep -OVN vtep controller - -%package ovn-common -Summary: Open vSwitch - Open Virtual Network support -License: ASL 2.0 -Requires: openvswitch - -%description ovn-common -Utilities that are use to diagnose and manage the OVN components. - -%package ovn-docker -Summary: Open vSwitch - Open Virtual Network support -License: ASL 2.0 -Requires: openvswitch openvswitch-ovn-common python2-openvswitch - -%description ovn-docker -Docker network plugins for OVN. - -%prep -%autosetup -n %{name}-%{version}%{?snap_gitsha} -a 1 -p 1 - -%build -%if %{with dpdk} -%ifarch %{dpdkarches} -%if %{with dpdkstatic} -# Lets build DPDK first -cd %{dpdkdir}-%{dpdkver} -function setconf() -{ - cf=%{dpdktarget}/.config - if grep -q $1 $cf; then - sed -i "s:^$1=.*$:$1=$2:g" $cf - else - echo $1=$2 >> $cf - fi -} - -# In case dpdk-devel is installed -unset RTE_SDK RTE_INCLUDE RTE_TARGET - -# Avoid appending second -Wall to everything, it breaks upstream warning -# disablers in makefiles. Strip explicit -march= from optflags since they -# will only guarantee build failures, DPDK is picky with that. -export EXTRA_CFLAGS="$(echo %{optflags} | sed -e 's:-Wall::g' -e 's:-march=[[:alnum:]]* ::g') -Wformat -fPIC" - -# DPDK defaults to using builder-specific compiler flags. However, -# the config has been changed by specifying CONFIG_RTE_MACHINE=default -# in order to build for a more generic host. NOTE: It is possible that -# the compiler flags used still won't work for all Fedora-supported -# machines, but runtime checks in DPDK will catch those situations. - -make V=1 O=%{dpdktarget} T=%{dpdktarget} %{?_smp_mflags} config - -# DPDK defaults to optimizing for the builder host we need generic binaries -setconf CONFIG_RTE_MACHINE '"%{machine}"' - -# Disable DPDK libraries not needed by OVS -setconf CONFIG_RTE_LIBRTE_TIMER n -setconf CONFIG_RTE_LIBRTE_CFGFILE n -setconf CONFIG_RTE_LIBRTE_JOBSTATS n -setconf CONFIG_RTE_LIBRTE_LPM n -setconf CONFIG_RTE_LIBRTE_ACL n -setconf CONFIG_RTE_LIBRTE_POWER n -setconf CONFIG_RTE_LIBRTE_DISTRIBUTOR n -setconf CONFIG_RTE_LIBRTE_REORDER n -setconf CONFIG_RTE_LIBRTE_PORT n -setconf CONFIG_RTE_LIBRTE_TABLE n -setconf CONFIG_RTE_LIBRTE_PIPELINE n -setconf CONFIG_RTE_LIBRTE_KNI n -setconf CONFIG_RTE_LIBRTE_CRYPTODEV n - -# Disable DPDK applications not needed by OVS -setconf CONFIG_RTE_APP_TEST n -setconf CONFIG_RTE_APP_CRYPTO_PERF n - -# Enable DPDK libraries needed by OVS -setconf CONFIG_RTE_LIBRTE_VHOST_NUMA y -setconf CONFIG_RTE_LIBRTE_PMD_PCAP y - -# Disable PMDs that are either not needed or not stable -setconf CONFIG_RTE_LIBRTE_PMD_VHOST n -setconf CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO n -# BNX2X driver is not stable -setconf CONFIG_RTE_LIBRTE_BNX2X_PMD n - -# Disable virtio user as not used by OVS -setconf CONFIG_RTE_VIRTIO_USER n - -# Disable kernel modules -setconf CONFIG_RTE_EAL_IGB_UIO n -setconf CONFIG_RTE_KNI_KMOD n - -# Disable experimental stuff -setconf CONFIG_RTE_NEXT_ABI n - -# Disable some PMDs on fdProd -setconf CONFIG_RTE_LIBRTE_BNXT_PMD n -setconf CONFIG_RTE_LIBRTE_ENA_PMD n -setconf CONFIG_RTE_LIBRTE_QEDE_PMD n - -make V=1 O=%{dpdktarget} %{?_smp_mflags} - -# Generate a list of supported drivers, its hard to tell otherwise. -cat << EOF > README.DPDK-PMDS -DPDK drivers included in this package: - -EOF - -for f in $(ls %{machine_arch}-%{machine_tmpl}-linuxapp-gcc/lib/lib*_pmd_*); do - basename ${f} | cut -c12- | cut -d. -f1 | tr [:lower:] [:upper:] -done >> README.DPDK-PMDS - -cat << EOF >> README.DPDK-PMDS - -For further information about the drivers, see -http://dpdk.org/doc/guides-%{dpdksver}/nics/index.html -EOF - -cd - -%endif -%endif -%endif - -%if 0%{?snap_gitsha:1} -# fix the snapshot unreleased version to be the released one. -sed -i.old -e "s/^AC_INIT(openvswitch,.*,/AC_INIT(openvswitch, %{version},/" configure.ac -./boot.sh -%endif - -%configure \ -%if %{with libcapng} - --enable-libcapng \ -%else - --disable-libcapng \ -%endif - --enable-ssl \ -%if %{with dpdk} -%ifarch %{dpdkarches} -%if %{with dpdkstatic} - --with-dpdk=$(pwd)/%{dpdkdir}-%{dpdkver}/%{dpdktarget} \ -%else - --with-dpdk=/usr \ -%endif -%endif -%endif - --with-pkidir=%{_sharedstatedir}/openvswitch/pki -/usr/bin/perl build-aux/dpdkstrip.pl \ - --dpdk \ - < rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \ - > rhel/usr_lib_systemd_system_ovs-vswitchd.service -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -%if %{with dpdk} -%ifarch %{dpdkarches} -# install dpdk usertools - install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/openvswitch/dpdk-usertools -%if %{with dpdkstatic} - install -p -m 0755 $(pwd)/%{dpdkdir}-%{dpdkver}/usertools/* $RPM_BUILD_ROOT%{_datadir}/openvswitch/dpdk-usertools -%else - install -p -m 0755 %{_datadir}/dpdk/usertools/* $RPM_BUILD_ROOT%{_datadir}/openvswitch/dpdk-usertools -%endif -%endif -%endif - -install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch -install -d -m 0750 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch -install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch - -install -p -D -m 0644 rhel/usr_lib_udev_rules.d_91-vfio.rules \ - $RPM_BUILD_ROOT%{_udevrulesdir}/91-vfio.rules - -install -p -D -m 0644 \ - rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \ - $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/openvswitch -for service in openvswitch ovsdb-server ovs-vswitchd \ - ovn-controller ovn-controller-vtep ovn-northd; do - install -p -D -m 0644 \ - rhel/usr_lib_systemd_system_${service}.service \ - $RPM_BUILD_ROOT%{_unitdir}/${service}.service -done - -install -m 0755 rhel/etc_init.d_openvswitch \ - $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/openvswitch.init - -install -p -D -m 0644 rhel/etc_openvswitch_default.conf \ - $RPM_BUILD_ROOT/%{_sysconfdir}/openvswitch/default.conf - -install -p -D -m 0644 rhel/etc_logrotate.d_openvswitch \ - $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/openvswitch - -install -m 0644 vswitchd/vswitch.ovsschema \ - $RPM_BUILD_ROOT/%{_datadir}/openvswitch/vswitch.ovsschema - -install -d -m 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ -install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs \ - $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs -install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifup-ovs \ - $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs - -install -d -m 0755 $RPM_BUILD_ROOT%{python2_sitelib} -cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/* \ - $RPM_BUILD_ROOT%{python2_sitelib} -rm -rf $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/ - -install -d -m 0755 $RPM_BUILD_ROOT/%{_sharedstatedir}/openvswitch - -install -d -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/ -install -p -m 0644 rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \ - $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml -install -p -m 0644 rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml \ - $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml - -install -d -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/ovn -ln -s %{_datadir}/openvswitch/scripts/ovndb-servers.ocf \ - $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/ovn/ovndb-servers - -touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/conf.db -touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf - -# remove unpackaged files -rm -f $RPM_BUILD_ROOT/%{_bindir}/ovs-benchmark \ - $RPM_BUILD_ROOT/%{_bindir}/ovs-parse-backtrace \ - $RPM_BUILD_ROOT/%{_sbindir}/ovs-vlan-bug-workaround \ - $RPM_BUILD_ROOT/%{_mandir}/man1/ovs-benchmark.1* \ - $RPM_BUILD_ROOT/%{_mandir}/man8/ovs-vlan-bug-workaround.8* \ - $RPM_BUILD_ROOT/%{_datadir}/openvswitch/scripts/ovs-save - -%check -%if %{with check} - if make check TESTSUITEFLAGS='%{_smp_mflags}' || - make check TESTSUITEFLAGS='--recheck'; then :; - else - cat tests/testsuite.log - exit 1 - fi -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - -%preun -%if 0%{?systemd_preun:1} - %systemd_preun %{name}.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable %{name}.service >/dev/null 2>&1 || : - /bin/systemctl stop %{name}.service >/dev/null 2>&1 || : - fi -%endif - -%preun ovn-central -%if 0%{?systemd_preun:1} - %systemd_preun ovn-northd.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable ovn-northd.service >/dev/null 2>&1 || : - /bin/systemctl stop ovn-northd.service >/dev/null 2>&1 || : - fi -%endif - -%preun ovn-host -%if 0%{?systemd_preun:1} - %systemd_preun ovn-controller.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable ovn-controller.service >/dev/null 2>&1 || : - /bin/systemctl stop ovn-controller.service >/dev/null 2>&1 || : - fi -%endif - -%preun ovn-vtep -%if 0%{?systemd_preun:1} - %systemd_preun ovn-controller-vtep.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable ovn-controller-vtep.service >/dev/null 2>&1 || : - /bin/systemctl stop ovn-controller-vtep.service >/dev/null 2>&1 || : - fi -%endif - -%post -if [ $1 -eq 1 ]; then - getent passwd openvswitch >/dev/null || \ - useradd -r -d / -s /sbin/nologin -c "Open vSwitch Daemons" openvswitch - - sed -i 's:^#OVS_USER_ID=:OVS_USER_ID=:' /etc/sysconfig/openvswitch - - getent group hugetlbfs >/dev/null || \ - groupadd hugetlbfs - usermod -a -G hugetlbfs openvswitch - sed -i \ - 's@OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:hugetlbfs"@'\ - /etc/sysconfig/openvswitch - - # In the case of upgrade, this is not needed. - chown -R openvswitch:openvswitch /etc/openvswitch -fi - -%if 0%{?systemd_post:1} - %systemd_post %{name}.service -%else - # Package install, not upgrade - if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >dev/null || : - fi -%endif - -%post ovn-central -%if 0%{?systemd_post:1} - %systemd_post ovn-northd.service -%else - # Package install, not upgrade - if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >dev/null || : - fi -%endif - -%post ovn-host -%if 0%{?systemd_post:1} - %systemd_post ovn-controller.service -%else - # Package install, not upgrade - if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >dev/null || : - fi -%endif - -%post ovn-vtep -%if 0%{?systemd_post:1} - %systemd_post ovn-controller-vtep.service -%else - # Package install, not upgrade - if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >dev/null || : - fi -%endif -%postun ovn-central -%if 0%{?systemd_postun_with_restart:1} - %systemd_postun_with_restart ovn-northd.service -%else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - if [ "$1" -ge "1" ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart ovn-northd.service >/dev/null 2>&1 || : - fi -%endif - -%postun ovn-host -%if 0%{?systemd_postun_with_restart:1} - %systemd_postun_with_restart ovn-controller.service -%else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - if [ "$1" -ge "1" ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart ovn-controller.service >/dev/null 2>&1 || : - fi -%endif - -%postun ovn-vtep -%if 0%{?systemd_postun_with_restart:1} - %systemd_postun_with_restart ovn-controller-vtep.service -%else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - if [ "$1" -ge "1" ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart ovn-controller-vtep.service >/dev/null 2>&1 || : - fi -%endif - -%postun -%if 0%{?systemd_postun_with_restart:1} - %systemd_postun_with_restart %{name}.service -%else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - if [ "$1" -ge "1" ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : - fi -%endif - - -%files -n python2-openvswitch -%{python2_sitelib}/ovs -%doc COPYING - -%files test -%{_bindir}/ovs-test -%{_bindir}/ovs-vlan-test -%{_bindir}/ovs-l3ping -%{_bindir}/ovs-pcap -%{_bindir}/ovs-tcpdump -%{_bindir}/ovs-tcpundump -%{_mandir}/man8/ovs-test.8* -%{_mandir}/man8/ovs-vlan-test.8* -%{_mandir}/man8/ovs-l3ping.8* -%{_mandir}/man1/ovs-pcap.1* -%{_mandir}/man8/ovs-tcpdump.8* -%{_mandir}/man1/ovs-tcpundump.1* -%{python2_sitelib}/ovstest - -%files devel -%{_libdir}/*.a -%{_libdir}/*.la -%{_libdir}/pkgconfig/*.pc -%{_includedir}/openvswitch/* -%{_includedir}/openflow/* -%{_includedir}/ovn/* - -%files -%defattr(-,root,root) -%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash -%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash -%dir %{_sysconfdir}/openvswitch -%{_sysconfdir}/openvswitch/default.conf -%config %ghost %{_sysconfdir}/openvswitch/conf.db -%config %ghost %{_sysconfdir}/openvswitch/system-id.conf -%config(noreplace) %{_sysconfdir}/sysconfig/openvswitch -%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch -%{_unitdir}/openvswitch.service -%{_unitdir}/ovs-vswitchd.service -%{_unitdir}/ovsdb-server.service -%{_datadir}/openvswitch/scripts/openvswitch.init -%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs -%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs -%if %{with dpdk} -%ifarch %{dpdkarches} -%{_datadir}/openvswitch/dpdk-usertools -%endif -%endif -%{_datadir}/openvswitch/bugtool-plugins/ -%{_datadir}/openvswitch/scripts/ovs-bugtool-* -%{_datadir}/openvswitch/scripts/ovs-check-dead-ifs -%{_datadir}/openvswitch/scripts/ovs-lib -%{_datadir}/openvswitch/scripts/ovs-vtep -%{_datadir}/openvswitch/scripts/ovs-ctl -%config %{_datadir}/openvswitch/vswitch.ovsschema -%config %{_datadir}/openvswitch/vtep.ovsschema -%{_bindir}/ovs-appctl -%{_bindir}/ovs-docker -%{_bindir}/ovs-dpctl -%{_bindir}/ovs-dpctl-top -%{_bindir}/ovs-ofctl -%{_bindir}/ovs-vsctl -%{_bindir}/ovsdb-client -%{_bindir}/ovsdb-tool -%{_bindir}/ovs-testcontroller -%{_bindir}/ovs-pki -%{_bindir}/vtep-ctl -%{_sbindir}/ovs-bugtool -%{_sbindir}/ovs-vswitchd -%{_sbindir}/ovsdb-server -%{_mandir}/man1/ovsdb-client.1* -%{_mandir}/man1/ovsdb-server.1* -%{_mandir}/man1/ovsdb-tool.1* -%{_mandir}/man5/ovs-vswitchd.conf.db.5* -%{_mandir}/man5/vtep.5* -%{_mandir}/man7/ovs-fields.7* -%{_mandir}/man8/vtep-ctl.8* -%{_mandir}/man8/ovs-appctl.8* -%{_mandir}/man8/ovs-bugtool.8* -%{_mandir}/man8/ovs-ctl.8* -%{_mandir}/man8/ovs-dpctl.8* -%{_mandir}/man8/ovs-dpctl-top.8* -%{_mandir}/man8/ovs-ofctl.8* -%{_mandir}/man8/ovs-pki.8* -%{_mandir}/man8/ovs-vsctl.8* -%{_mandir}/man8/ovs-vswitchd.8* -%{_mandir}/man8/ovs-parse-backtrace.8* -%{_mandir}/man8/ovs-testcontroller.8* -%{_udevrulesdir}/91-vfio.rules -%doc COPYING NOTICE README.rst NEWS rhel/README.RHEL.rst -/var/lib/openvswitch -/var/log/openvswitch -%ghost %attr(755,root,root) %{_rundir}/openvswitch - -%files ovn-docker -%{_bindir}/ovn-docker-overlay-driver -%{_bindir}/ovn-docker-underlay-driver - -%files ovn-common -%{_bindir}/ovn-detrace -%{_bindir}/ovn-nbctl -%{_bindir}/ovn-sbctl -%{_bindir}/ovn-trace -%{_datadir}/openvswitch/scripts/ovn-ctl -%{_datadir}/openvswitch/scripts/ovndb-servers.ocf -%{_datadir}/openvswitch/scripts/ovn-bugtool-nbctl-show -%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-lflow-list -%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-show -%{_mandir}/man1/ovn-detrace.1* -%{_mandir}/man8/ovn-ctl.8* -%{_mandir}/man8/ovn-nbctl.8* -%{_mandir}/man8/ovn-trace.8* -%{_mandir}/man7/ovn-architecture.7* -%{_mandir}/man8/ovn-sbctl.8* -%{_mandir}/man5/ovn-nb.5* -%{_mandir}/man5/ovn-sb.5* -%{_prefix}/lib/ocf/resource.d/ovn/ovndb-servers - -%files ovn-central -%{_bindir}/ovn-northd -%{_mandir}/man8/ovn-northd.8* -%config %{_datadir}/openvswitch/ovn-nb.ovsschema -%config %{_datadir}/openvswitch/ovn-sb.ovsschema -%{_unitdir}/ovn-northd.service -%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml - -%files ovn-host -%{_bindir}/ovn-controller -%{_mandir}/man8/ovn-controller.8* -%{_unitdir}/ovn-controller.service -%{_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml - -%files ovn-vtep -%{_bindir}/ovn-controller-vtep -%{_mandir}/man8/ovn-controller-vtep.8* -%{_unitdir}/ovn-controller-vtep.service - -%changelog -* Tue Jan 30 2018 Lianhao Lu - 2.8.1-3.tis.1 -- Adjusted for TiC -- Include dpdk usertools in the final package - -* Mon Oct 02 2017 Timothy Redaelli - 2.8.1-1 -- Update to Open vSwitch 2.8.1 - -* Tue Sep 19 2017 Timothy Redaelli - 2.8.0-2 -- Update DPDK to 17.05.2 (bugfixes) - -* Mon Sep 04 2017 Timothy Redaelli - 2.8.0-1 -- Update to Open vSwitch 2.8.0 and DPDK 17.05.1 (#1487971) - -* Thu Aug 03 2017 Fedora Release Engineering - 2.7.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.7.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jul 19 2017 Timothy Redaelli - 2.7.2-1 -- Update to Open vSwitch 2.7.2 -- Add a symlink of the OCF script in the OCF resources folder - -* Fri Jul 14 2017 Timothy Redaelli - 2.7.1-2 -- Backport fix for CVE-2017-9263 (#1457327) -- Backport fix for CVE-2017-9265 (#1457335) - -* Thu Jul 06 2017 Timothy Redaelli - 2.7.1-1 -- Updated to Open vSwitch 2.7.1 and DPDK 16.11.2 (#1468234) - -* Tue Jun 13 2017 Timothy Redaelli - 2.7.0-5 -- Backport fix for CVE-2017-9264 (#1457329) - -* Wed Jun 07 2017 Timothy Redaelli - 2.7.0-4 -- Remove PYTHONCOERCECLOCALE=0 workaround and backport upstream patch (#1454364) - -* Wed May 31 2017 Timothy Redaelli - 2.7.0-3 -- Backport fix for CVE-2017-9214 (#1456797) -- Use %%autosetup instead of %%setup - -* Mon May 29 2017 Timothy Redaelli - 2.7.0-2 -- Install OVN firewalld rules - -* Thu May 18 2017 Timothy Redaelli - 2.7.0-1 -- Link statically with DPDK 16.11.1 (#1451476) -- Build OVS without DPDK support on all architectures not supported by DPDK -- Added python3-six to BuildRequires in order to launch python3 tests too -- Export PYTHONCOERCECLOCALE=0 in order to workaround an incompatibility - between Python 3.6.0 (with PEP 538) on Fedora 26+ and testsuite (#1454364) -- Disable tests on armv7hl - -* Fri Feb 24 2017 Timothy Redaelli - 2.7.0-0 -- Updated to Open vSwitch 2.7.0 (#1426596) -- Enable DPDK support - -* Thu Feb 16 2017 Timothy Redaelli - 2.6.1-2 -- Added python3-openvswitch and renamed python-openvswitch to python2-openvswitch - -* Sat Feb 11 2017 Fedora Release Engineering - 2.6.1-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Nov 24 2016 Flavio Leitner - 2.6.1-0 -- Updated to Open vSwitch 2.6.1 - -* Tue Nov 01 2016 Aaron Conole - 2.6.0-0 -- Update to Open vSwitch 2.6.0 -- Enable OVN - -* Wed Aug 24 2016 Dan Horák - 2.5.0-4 -- don't run the test-suite for big endian arches - -* Tue Jul 19 2016 Fedora Release Engineering - 2.5.0-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Tue Mar 15 2016 Panu Matilainen - 2.5.0-2 -- Remove unpackaged files instead of excluding (#1281913) - -* Wed Mar 02 2016 Panu Matilainen - 2.5.0-1 -- Update to 2.5.0 (#1312617) - -* Thu Feb 04 2016 Fedora Release Engineering - 2.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Aug 24 2015 Flavio Leitner - 2.4.0-1 -- updated to 2.4.0 (#1256171) - -* Thu Jun 18 2015 Flavio Leitner - 2.3.2-1 -- updated to 2.3.2 (#1233442) -- fixed to own /var/run/openvswitch directory (#1200887) - -* Thu Jun 18 2015 Fedora Release Engineering - 2.3.1-4.git20150327 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Mar 27 2015 Flavio Leitner - 2.3.1-3.git20150327 -- updated to 2.3.1-git4750c96 -- commented out kernel requires -- added requires to procps-ng (testsuite #84) - -* Wed Jan 14 2015 Flavio Leitner - 2.3.1-2.git20150113 -- updated to 2.3.1-git3282e51 - -* Fri Dec 05 2014 Flavio Leitner - 2.3.1-1 -- updated to 2.3.1 - -* Fri Nov 07 2014 Flavio Leitner - 2.3.0-3.git20141107 -- updated to 2.3.0-git39ebb203 - -* Thu Oct 23 2014 Flavio Leitner - 2.3.0-2 -- fixed to own conf.db and system-id.conf in /etc/openvswitch. - (#1132707) - -* Tue Aug 19 2014 Flavio Leitner - 2.3.0-1 -- updated to 2.3.0 - -* Sun Aug 17 2014 Fedora Release Engineering - 2.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jun 12 2014 Flavio Leitner - 2.1.2-4 -- moved README.RHEL to be in the standard doc dir. -- added FAQ and NEWS files to the doc list. -- excluded PPC arch - -* Thu Jun 12 2014 Flavio Leitner - 2.1.2-3 -- removed ovsdbmonitor packaging - -* Sat Jun 07 2014 Fedora Release Engineering - 2.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 25 2014 Flavio Leitner - 2.1.2-1 -- updated to 2.1.2 - -* Tue Mar 25 2014 Flavio Leitner - 2.1.0-1 -- updated to 2.1.0 -- obsoleted openvswitch-controller package -- requires kernel 3.15.0-0 or newer - (kernel commit 4f647e0a3c37b8d5086214128614a136064110c3 - openvswitch: fix a possible deadlock and lockdep warning) -- ovs-lib: allow non-root users to check service status - (upstream commit 691e47554dd03dd6492e00bab5bd6d215f5cbd4f) -- rhel: Add Patch Port support to initscripts - (upstream commit e2bcc8ef49f5e51f48983b87ab1010f0f9ab1454) - -* Mon Jan 27 2014 Flavio Leitner - 2.0.1-1 -- updated to 2.0.1 - -* Mon Jan 27 2014 Flavio Leitner - 2.0.0-6 -- create a -devel package - (from Chris Wright ) - -* Wed Jan 15 2014 Flavio Leitner - 2.0.0-5 -- Enable DHCP support for internal ports - (upstream commit 490db96efaf89c63656b192d5ca287b0908a6c77) - -* Wed Jan 15 2014 Flavio Leitner - 2.0.0-4 -- disabled ovsdbmonitor packaging - (upstream has removed the component) - -* Wed Jan 15 2014 Flavio Leitner - 2.0.0-3 -- fedora package: fix systemd ordering and deps. - (upstream commit b49c106ef00438b1c59876dad90d00e8d6e7b627) - -* Wed Jan 15 2014 Flavio Leitner - 2.0.0-2 -- util: use gcc builtins to better check array sizes - (upstream commit 878f1972909b33f27b32ad2ded208eb465b98a9b) - -* Mon Oct 28 2013 Flavio Leitner - 2.0.0-1 -- updated to 2.0.0 (#1023184) - -* Mon Oct 28 2013 Flavio Leitner - 1.11.0-8 -- applied upstream commit 7b75828bf5654c494a53fa57be90713c625085e2 - rhel: Option to create tunnel through ifcfg scripts. - -* Mon Oct 28 2013 Flavio Leitner - 1.11.0-7 -- applied upstream commit 32aa46891af5e173144d672e15fec7c305f9a4f3 - rhel: Set STP of a bridge during bridge creation. - -* Mon Oct 28 2013 Flavio Leitner - 1.11.0-6 -- applied upstream commit 5b56f96aaad4a55a26576e0610fb49bde448dabe - rhel: Prevent duplicate ifup calls. - -* Mon Oct 28 2013 Flavio Leitner - 1.11.0-5 -- applied upstream commit 79416011612541d103a1d396d888bb8c84eb1da4 - rhel: Return an exit value of 0 for ifup-ovs. - -* Mon Oct 28 2013 Flavio Leitner - 1.11.0-4 -- applied upstream commit 2517bad92eec7e5625bc8b248db22fdeaa5fcde9 - Added RHEL ovs-ifup STP option handling - -* Tue Oct 1 2013 Flavio Leitner - 1.11.0-3 -- don't use /var/lock/subsys with systemd (#1006412) - -* Thu Sep 19 2013 Flavio Leitner - 1.11.0-2 -- ovsdbmonitor package is optional - -* Thu Aug 29 2013 Thomas Graf - 1.11.0-1 -- Update to 1.11.0 - -* Tue Aug 13 2013 Flavio Leitner - 1.10.0-7 -- Fixed openvswitch-nonetwork to start openvswitch.service (#996804) - -* Sat Aug 03 2013 Petr Pisar - 1.10.0-6 -- Perl 5.18 rebuild - -* Tue Jul 23 2013 Thomas Graf - 1.10.0-5 -- Typo - -* Tue Jul 23 2013 Thomas Graf - 1.10.0-4 -- Spec file fixes -- Maintain local copy of sysconfig.template - -* Thu Jul 18 2013 Petr Pisar - 1.10.0-3 -- Perl 5.18 rebuild - -* Mon Jul 01 2013 Thomas Graf - 1.10.0-2 -- Enable PIE (#955181) -- Provide native systemd unit files (#818754) - -* Thu May 02 2013 Thomas Graf - 1.10.0-1 -- Update to 1.10.0 (#958814) - -* Thu Feb 28 2013 Thomas Graf - 1.9.0-1 -- Update to 1.9.0 (#916537) - -* Tue Feb 12 2013 Thomas Graf - 1.7.3-8 -- Fix systemd service dependency loop (#818754) - -* Fri Jan 25 2013 Thomas Graf - 1.7.3-7 -- Auto-start openvswitch service on ifup/ifdown (#818754) -- Add OVSREQUIRES to allow defining OpenFlow interface dependencies - -* Thu Jan 24 2013 Thomas Graf - 1.7.3-6 -- Update to Open vSwitch 1.7.3 - -* Tue Nov 20 2012 Thomas Graf - 1.7.1-6 -- Increase max fd limit to support 256 bridges (#873072) - -* Thu Nov 1 2012 Thomas Graf - 1.7.1-5 -- Don't create world writable pki/*/incomming directory (#845351) - -* Thu Oct 25 2012 Thomas Graf - 1.7.1-4 -- Don't add iptables accept rule for -p GRE as GRE tunneling is unsupported - -* Tue Oct 16 2012 Thomas Graf - 1.7.1-3 -- require systemd instead of systemd-units to use macro helpers (#850258) - -* Tue Oct 9 2012 Thomas Graf - 1.7.1-2 -- make ovs-vsctl timeout if daemon is not running (#858722) - -* Mon Sep 10 2012 Thomas Graf - 1.7.1.-1 -- Update to 1.7.1 - -* Fri Sep 7 2012 Thomas Graf - 1.7.0.-3 -- add controller package containing ovs-controller - -* Thu Aug 23 2012 Tomas Hozza - 1.7.0-2 -- fixed SPEC file so it comply with new systemd-rpm macros guidelines (#850258) - -* Fri Aug 17 2012 Tomas Hozza - 1.7.0-1 -- Update to 1.7.0 -- Fixed openvswitch-configure-ovskmod-var-autoconfd.patch because - openvswitch kernel module name changed in 1.7.0 -- Removed Source8: ovsdbmonitor-move-to-its-own-data-directory.patch -- Patches merged: - - ovsdbmonitor-move-to-its-own-data-directory-automaked.patch - - openvswitch-rhel-initscripts-resync.patch - -* Fri Jul 20 2012 Fedora Release Engineering - 1.4.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Mar 15 2012 Chris Wright - 1.4.0-5 -- fix ovs network initscripts DHCP address acquisition (#803843) - -* Tue Mar 6 2012 Chris Wright - 1.4.0-4 -- make BuildRequires openssl explicit (needed on f18/rawhide now) - -* Tue Mar 6 2012 Chris Wright - 1.4.0-3 -- use glob to catch compressed manpages - -* Thu Mar 1 2012 Chris Wright - 1.4.0-2 -- Update License comment, use consitent macros as per review comments bz799171 - -* Wed Feb 29 2012 Chris Wright - 1.4.0-1 -- Initial package for Fedora diff --git a/networking/openvswitch/centos/patches/log-rotation-config.patch b/networking/openvswitch/centos/patches/log-rotation-config.patch new file mode 100644 index 000000000..20e10bf47 --- /dev/null +++ b/networking/openvswitch/centos/patches/log-rotation-config.patch @@ -0,0 +1,29 @@ +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 + diff --git a/networking/openvswitch/centos/patches/run-services-as-root-user.patch b/networking/openvswitch/centos/patches/run-services-as-root-user.patch new file mode 100644 index 000000000..cc08d662e --- /dev/null +++ b/networking/openvswitch/centos/patches/run-services-as-root-user.patch @@ -0,0 +1,38 @@ +From 76ba5dcc92ad317d2b19cac916d710465e43e3a8 Mon Sep 17 00:00:00 2001 +From: Matt Peters +Date: Tue, 29 May 2018 12:20:27 -0500 +Subject: [PATCH] run services as root user + +--- + rhel/etc_openvswitch_default.conf | 2 +- + rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ---- + 2 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/rhel/etc_openvswitch_default.conf b/rhel/etc_openvswitch_default.conf +index c74417d..56d79eb 100644 +--- a/rhel/etc_openvswitch_default.conf ++++ b/rhel/etc_openvswitch_default.conf +@@ -2,4 +2,4 @@ + + # The following is the *default* configuration for the openvswitch user ID. + # This is for backward compatibility. +-OVS_USER_ID="root:root" ++OVS_USER_ID="" +diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +index c6d9aa1..63eb68e 100644 +--- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in ++++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +@@ -13,10 +13,6 @@ Restart=on-failure + Environment=HOME=/var/run/openvswitch + EnvironmentFile=/etc/openvswitch/default.conf + EnvironmentFile=-/etc/sysconfig/openvswitch +-@begin_dpdk@ +-ExecStartPre=-/usr/bin/chown :hugetlbfs /dev/hugepages +-ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages +-@end_dpdk@ + ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ + --no-ovsdb-server --no-monitor --system-id=random \ + --ovs-user=${OVS_USER_ID} \ +-- +1.8.3.1 + diff --git a/networking/openvswitch/centos/srpm_path b/networking/openvswitch/centos/srpm_path new file mode 100644 index 000000000..889cf9ea1 --- /dev/null +++ b/networking/openvswitch/centos/srpm_path @@ -0,0 +1 @@ +mirror:/Source/openvswitch-2.9.0-3.el7.src.rpm diff --git a/networking/openvswitch/files/ovsdb-server.pmon.conf b/networking/openvswitch/files/ovsdb-server.pmon.conf new file mode 100644 index 000000000..d357c44c8 --- /dev/null +++ b/networking/openvswitch/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/patches/ovs-vswitchd.system.service.patch b/networking/openvswitch/patches/ovs-vswitchd.system.service.patch deleted file mode 100644 index 6802dad7d..000000000 --- a/networking/openvswitch/patches/ovs-vswitchd.system.service.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in 2017-09-29 13:41:03.569697066 +0800 -+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in 2018-02-05 18:42:08.183083617 +0800 -@@ -15,7 +15,11 @@ - EnvironmentFile=-/etc/sysconfig/openvswitch - @begin_dpdk@ - ExecStartPre=-/usr/bin/chown :hugetlbfs /dev/hugepages -+ExecStartPre=-/usr/bin/chown -R :hugetlbfs /mnt/huge-2048kB -+ExecStartPre=-/usr/bin/chown -R :hugetlbfs /mnt/huge-1048576kB - ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages -+ExecStartPre=-/usr/bin/chmod 0775 /mnt/huge-2048kB -+ExecStartPre=-/usr/bin/chmod 0775 /mnt/huge-1048576kB - @end_dpdk@ - ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ - --no-ovsdb-server --no-monitor --system-id=random \ diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-list_admin_response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-list_admin_response.json index 13118cd87..220ea18ae 100644 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-list_admin_response.json +++ b/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-list_admin_response.json @@ -4,7 +4,7 @@ "agents": [ { "id": "894d7327-ef14-468d-9037-82f7209a4165", - "type": "AVS agent" + "type": "Open vSwitch agent" }, { "id": "b3aa7556-0f13-4822-9707-d42b5bca114d", @@ -32,7 +32,7 @@ }, { "id": "53b84157-5761-4480-8b14-10abc22e3c65", - "type": "AVS agent" + "type": "Open vSwitch agent" }, { "id": "3c28bc57-ae08-428f-8387-1e4b74376220", diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-show_admin_response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-show_admin_response.json index 204ea7032..7dae9e51a 100644 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-show_admin_response.json +++ b/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-show_admin_response.json @@ -11,7 +11,7 @@ }, { "id": "894d7327-ef14-468d-9037-82f7209a4165", - "type": "AVS agent" + "type": "Open vSwitch agent" } ], "availability": "up", diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-update_admin_response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-update_admin_response.json index cd50c4b7f..870245b83 100644 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-update_admin_response.json +++ b/restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-update_admin_response.json @@ -3,7 +3,7 @@ "agents": [ { "id": "894d7327-ef14-468d-9037-82f7209a4165", - "type": "AVS agent" + "type": "Open vSwitch agent" }, { "id": "b3aa7556-0f13-4822-9707-d42b5bca114d", diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_list-response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_list-response.json index 44d10d81b..a963d74a1 100644 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_list-response.json +++ b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_list-response.json @@ -1,12 +1,14 @@ { "imemorys" : [ { + "vswitch_hugepages_nr" : 1, "hugepages_configured" : "True", "vm_hugepages_nr_1G_pending" : null, "memavail_mib" : 22448, "uuid" : "34098f3a-6b95-4cad-aecb-986dc6312f4f", "ihost_uuid" : "afecdcfb-2954-498d-88bf-d1385b00f34d", "created_at" : "2015-04-06T20:27:50.171841+00:00", + "vswitch_hugepages_size_mib" : 1024, "vm_hugepages_avail_1G" : 0, "capabilities" : {}, "links" : [ @@ -20,7 +22,9 @@ } ], "vm_hugepages_nr_2M_pending" : null, + "vswitch_hugepages_reqd" : null, "vm_hugepages_avail_2M" : 11224, + "vswitch_hugepages_avail" : 0, "numa_node" : 0, "vm_hugepages_nr_1G" : 0, "updated_at" : "2015-04-08T11:32:25.205552+00:00", @@ -30,12 +34,14 @@ "inode_uuid" : "c65c852c-1707-40e1-abfc-334270ec0427" }, { + "vswitch_hugepages_nr" : 1, "hugepages_configured" : "True", "vm_hugepages_nr_1G_pending" : null, "memavail_mib" : 24082, "uuid" : "85df5109-77d9-4335-9181-0efa82c98dcc", "ihost_uuid" : "afecdcfb-2954-498d-88bf-d1385b00f34d", "created_at" : "2015-04-06T20:27:50.182764+00:00", + "vswitch_hugepages_size_mib" : 1024, "vm_hugepages_avail_1G" : 0, "capabilities" : {}, "links" : [ @@ -49,7 +55,9 @@ } ], "vm_hugepages_nr_2M_pending" : null, + "vswitch_hugepages_reqd" : null, "vm_hugepages_avail_2M" : 12041, + "vswitch_hugepages_avail" : 0, "numa_node" : 1, "vm_hugepages_nr_1G" : 0, "updated_at" : "2015-04-08T11:32:25.220242+00:00", diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_modify-response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_modify-response.json index 98b7a345b..192b91d2b 100644 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_modify-response.json +++ b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_modify-response.json @@ -1,10 +1,12 @@ { + "vswitch_hugepages_nr" : 1, "hugepages_configured" : "True", "vm_hugepages_nr_1G_pending" : null, "memavail_mib" : 24082, "uuid" : "85df5109-77d9-4335-9181-0efa82c98dcc", "ihost_uuid" : "afecdcfb-2954-498d-88bf-d1385b00f34d", "created_at" : "2015-04-06T20:27:50.182764+00:00", + "vswitch_hugepages_size_mib" : 1024, "vm_hugepages_avail_1G" : 0, "capabilities" : {}, "links" : [ @@ -18,7 +20,9 @@ } ], "vm_hugepages_nr_2M_pending" : null, + "vswitch_hugepages_reqd" : null, "vm_hugepages_avail_2M" : 12041, + "vswitch_hugepages_avail" : 0, "numa_node" : 1, "vm_hugepages_nr_1G" : 0, "updated_at" : "2015-04-08T11:33:25.280674+00:00", diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_show-response.json b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_show-response.json index 98b7a345b..192b91d2b 100644 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_show-response.json +++ b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_show-response.json @@ -1,10 +1,12 @@ { + "vswitch_hugepages_nr" : 1, "hugepages_configured" : "True", "vm_hugepages_nr_1G_pending" : null, "memavail_mib" : 24082, "uuid" : "85df5109-77d9-4335-9181-0efa82c98dcc", "ihost_uuid" : "afecdcfb-2954-498d-88bf-d1385b00f34d", "created_at" : "2015-04-06T20:27:50.182764+00:00", + "vswitch_hugepages_size_mib" : 1024, "vm_hugepages_avail_1G" : 0, "capabilities" : {}, "links" : [ @@ -18,7 +20,9 @@ } ], "vm_hugepages_nr_2M_pending" : null, + "vswitch_hugepages_reqd" : null, "vm_hugepages_avail_2M" : 12041, + "vswitch_hugepages_avail" : 0, "numa_node" : 1, "vm_hugepages_nr_1G" : 0, "updated_at" : "2015-04-08T11:33:25.280674+00:00", diff --git a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/common.ent b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/common.ent index 119436dd3..94e3fac56 100644 --- a/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/common.ent +++ b/restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/common.ent @@ -915,7 +915,7 @@ Platform, Vswitch, Shared or VMs . Platform indicates the core is used for the host kernel, Titanium Cloud and OpenStack Services, - Vswitch indicates the core is used by AVS, the + Vswitch indicates the core is used by the virtual switch, Shared indicates that the core is reserved for sharing by VMs using the hw:wrs:shared_vcpu flavor extra spec, @@ -1011,6 +1011,29 @@ or not. + + + The size of a Virtual Switch (vSwitch) huge page, + in MiBs. + + + + + The total number of Virtual Switch (vSwitch) huge + pages. + + + + + The free / available Virtual Switch (vSwitch) huge pages. + +