summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-06-17 00:27:30 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-17 00:27:30 +0000
commit109b0e70eb9963fd5d4aa8e7fda3cc30ec7752b9 (patch)
tree95533db952a356654e7adbe4a2a27f03274bb458
parentb0670cfd013bf0ef4a1c1b3723fa3f5da6dd108d (diff)
parent1e0f9ea7d48815b7b10befa23e3c67a1d24e19e7 (diff)
Merge "Add OVS with NSH/DPDK build"
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index ce4c269fd..de18ced7a 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -11,7 +11,7 @@
# Add Fuel plugin build targets here
# Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have
# verified it!
-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild
+PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild
#PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
export PLUGINS
#NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
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 91820807d..819379ed6 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=27eaf16ac1ca2849f85e85e969c6e322c8cb42ae
+OVS_NSH_DPDK_BRANCH=bee1b2b540922f0a1439d3b878480da590f506d8
OVS_NSH_DPDK_REPO=https://review.openstack.org/openstack/fuel-plugin-ovs
OVS_NSH_DPDK_CHANGE=