Turn ovs-plugin on

The ovs-plugin has been rebased to fuel 10/newton.

Change-Id: I23d9f33b005ec139862e4a53b70987706ae98198
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index db85916..13f69b9 100644 (file)
--- 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 e73c1b9..8d267d2 100644 (file)
--- 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?=