summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-02-05 18:21:01 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-02-16 13:31:26 +0000
commit209a456cb1ee8b7045e89a06ef09b6c697896b20 (patch)
treea6d06fb589e6b7fec34844833ca449cec30e5afc /build
parent28047aa0687ee1b7f3db5e90393c752fe00ef686 (diff)
Applying ODL changes to BGPVPN scenario
Since module substitionion does not support arrays the plugin attributes are added to the scenario file and not taken from the plugin files. In addition the bgpvpn plugin contains a fix for the instable stable/liberty branch now. Change-Id: I94ce93bbbe6596ff9417bdd8c11dc62cd2167c11 (cherry picked from commit ad8a87e29afa370207224975841420a29b408ea1)
Diffstat (limited to 'build')
-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