aboutsummaryrefslogtreecommitdiffstats
path: root/build/f_isoroot
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-02-16 13:31:13 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-16 13:31:13 +0000
commitcbaf09c30996daea563ee7fe8104787f10b0fb09 (patch)
treeb6c038ff215b92a4c83f6c0ee8b656bf0451624f /build/f_isoroot
parent58f1f76eb7dd4d4cc8bcabbbbafc0cd0451bf5b8 (diff)
parentad8a87e29afa370207224975841420a29b408ea1 (diff)
Merge "Applying ODL changes to BGPVPN scenario"
Diffstat (limited to 'build/f_isoroot')
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_bgpvpn-pluginbuild/config.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index ee27adb49..878278942 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -9,7 +9,7 @@
##############################################################################
# Add Fuel plugin build targets here
-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild 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_bgpvpn-pluginbuild/config.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
index fc85c059e..e6538d5b4 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
@@ -9,4 +9,4 @@
BGPVPN_BRANCH=master
BGPVPN_REPO="https://github.com/openstack/fuel-plugin-bgpvpn.git"
-BGPVPN_CHANGE=27c8f609472b74a9205d244e4d93378b5a9ebfae
+BGPVPN_CHANGE=fa803b03e768925428a719c7b1825e7bf7bb9f11