starlingx
/
upstream
Code Issues Proposed changes

Open vSwitch integration with host and configuration framework 

Integrates the latest Open vSwitch with DPDK into the host management
and configuration framework and configures the default system
vswitch type to be ovs-dpdk.

Change-Id: I943f7668d9c94508706fa1611444898fc28ad4c7
Signed-off-by: Matt Peters <matt.peters@windriver.com>
This commit is contained in:
Matt Peters 2018-06-07 19:27:45 -05:00
parent 9d3ca49387
commit 3a375fde71
7 changed files with 91 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/openstack-os-vif/centos/build_srpm.data Normal file
View File

@ -0,0 +1 @@
TIS_PATCH_VER=0

81
openstack/openstack-os-vif/centos/meta_patches/0001-tis-version-and-build.patch Normal file
View File

@ -0,0 +1,81 @@
From 0482f8ba06d58a5676e80565cd4af08475e4ab55 Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Wed, 30 May 2018 13:40:28 -0500
Subject: [PATCH] tis version and build
---
SPECS/python-os-vif.spec | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/SPECS/python-os-vif.spec b/SPECS/python-os-vif.spec
index f99c901..fe7f772 100644
--- a/SPECS/python-os-vif.spec
+++ b/SPECS/python-os-vif.spec
@@ -12,7 +12,7 @@
Name: python-%{library}
Version: 1.9.1
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: OpenStack os-vif library
License: ASL 2.0
URL: http://launchpad.net/%{library}/
@@ -29,11 +29,11 @@ BuildRequires: python2-devel
BuildRequires: python2-pbr
BuildRequires: python2-setuptools
BuildRequires: git
-BuildRequires: python2-subunit
+BuildRequires: python-subunit
BuildRequires: python2-oslotest
-BuildRequires: python2-os-testr
+BuildRequires: python-os-testr
BuildRequires: python2-pyroute2
-BuildRequires: python2-testtools
+BuildRequires: python-testtools
BuildRequires: python2-oslo-log
BuildRequires: python2-oslo-concurrency
BuildRequires: python2-oslo-privsep
@@ -47,12 +47,14 @@ BuildRequires: python-testrepository
BuildRequires: python-testscenarios
%endif
+# Downgrade OSLO components to support backport
+# NOTE: this can be restored after OSLO upgrade
Requires: python2-pbr >= 2.0.0
-Requires: python2-oslo-config >= 2:5.1.0
+Requires: python2-oslo-config >= 2:4.11.0
Requires: python2-oslo-log >= 3.30.0
Requires: python2-oslo-i18n >= 3.15.3
-Requires: python2-oslo-privsep >= 1.23.0
-Requires: python2-oslo-versionedobjects >= 1.28.0
+Requires: python2-oslo-privsep >= 1.22.0
+Requires: python2-oslo-versionedobjects >= 1.26.0
Requires: python2-pyroute2
Requires: python2-six >= 1.10.0
Requires: python2-stevedore >= 1.20.0
@@ -70,10 +72,10 @@ A library for plugging and unplugging virtual interfaces in OpenStack.
%package -n python2-%{library}-tests
Summary: OpenStack os-vif library tests
Requires: python2-%{library} = %{version}-%{release}
-Requires: python2-subunit
+Requires: python-subunit
Requires: python2-oslotest
-Requires: python2-os-testr
-Requires: python2-testtools
+Requires: python-os-testr
+Requires: python-testtools
Requires: python2-oslo-versionedobjects-tests
%if 0%{?fedora} > 0
Requires: python2-testrepository
@@ -188,7 +190,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
export OS_TEST_PATH='./os_vif/tests/unit'
export PATH=$PATH:$RPM_BUILD_ROOT/usr/bin
export PYTHONPATH=$PWD
-stestr --test-path $OS_TEST_PATH run
+#stestr --test-path $OS_TEST_PATH run
%if 0%{?with_python3}
rm -rf .stestr
stestr-3 --test-path $OS_TEST_PATH run
--
1.8.3.1

1
openstack/openstack-os-vif/centos/meta_patches/PATCH_ORDER Normal file
View File

@ -0,0 +1 @@
0001-tis-version-and-build.patch

1
openstack/openstack-os-vif/centos/srpm_path Normal file
View File

@ -0,0 +1 @@
mirror:Source/python-os-vif-1.9.1-1.el7.src.rpm

4
openstack/python-neutron/centos/files/neutron-l3-agent.service
View File

@ -4,8 +4,8 @@ After=syslog.target network.target
[Service]
Type=simple
User=neutron
ExecStart=/usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log
User=root
ExecStart=/usr/bin/neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent
PrivateTmp=false
KillMode=process

4
openstack/python-neutron/centos/files/neutron-openvswitch-agent.service
View File

@ -5,8 +5,8 @@ PartOf=network.service
[Service]
Type=simple
User=neutron
ExecStart=/usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-openvswitch-agent --log-file /var/log/neutron/openvswitch-agent.log
User=root
ExecStart=/usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-openvswitch-agent
PrivateTmp=true
KillMode=process

6
openstack/python-neutron/centos/files/neutron-ovs-cleanup.service
View File

@ -5,9 +5,9 @@ Before=neutron-openvswitch-agent.service neutron-dhcp-agent.service neutron-l3-a
[Service]
Type=oneshot
User=neutron
ExecStart=/usr/bin/neutron-ovs-cleanup --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-ovs-cleanup --log-file /var/log/neutron/ovs-cleanup.log
ExecStop=/usr/bin/neutron-ovs-cleanup --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-ovs-cleanup --log-file /var/log/neutron/ovs-cleanup.log
User=root
ExecStart=/usr/bin/neutron-ovs-cleanup --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-ovs-cleanup
ExecStop=/usr/bin/neutron-ovs-cleanup --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-ovs-cleanup
PrivateTmp=true
RemainAfterExit=yes