From f9f173106d9328d325a9d86314c92bb2af77da7e Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 17 Nov 2016 16:59:35 +0300 Subject: Turn ovs-plugin on The ovs-plugin has been rebased to fuel 10/newton. Change-Id: I23d9f33b005ec139862e4a53b70987706ae98198 Signed-off-by: Michael Polenchuk --- build/f_isoroot/Makefile | 4 ++-- build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index db85916c5..13f69b942 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,9 +11,9 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have # verified it! -PLUGINS = +PLUGINS = f_ovs-nsh-dpdk-pluginbuild export PLUGINS -NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild +NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins # indicated therein. diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk index e73c1b9e3..8d267d249 100644 --- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk +++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk @@ -7,6 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -OVS_NSH_DPDK_BRANCH?=0c85aa25efd3f47008effe9f469d86073df18e12 +OVS_NSH_DPDK_BRANCH?=a8f78d202d502f0bc51d12d88b39905a8e8278e8 OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs OVS_NSH_DPDK_CHANGE?= -- cgit 1.2.3-korg