summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2017-01-30 14:44:08 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-01-31 16:43:48 +0100
commit6753eebc3e581a4491f5b7186f1c5423dae92ae4 (patch)
tree6d827fc9b20adaece76915466d462868ceb6b438
parentba267a58918893fb728ee501ca22f50e6f561a06 (diff)
Enable bgpvpn plugin build and bump repo
Change-Id: I298868aedf55c560194556bf6680289ae73a5113 Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com> Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--build/f_isoroot/Makefile4
-rw-r--r--build/f_isoroot/f_bgpvpn-pluginbuild/Makefile6
-rw-r--r--build/f_isoroot/f_bgpvpn-pluginbuild/config.mk2
3 files changed, 9 insertions, 3 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 890cfaf5a..9feddba5b 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 ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild
+PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild
export PLUGINS
-NON_10-0_REBASED_PLUGINS = f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild
+NON_10-0_REBASED_PLUGINS = f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild
# If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
# indicated therein.
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
index 8ce28fcf8..a236b63b4 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
@@ -34,6 +34,12 @@ release:.bgpvpnbuild
cp gitinfo_bgpvpnplugin.txt $(BUILD_BASE)
.bgpvpnbuild:
+ # The python packages build into deb by this plugin require a newer
+ # setuptools install a newer setuptools version until the container
+ # where this is run is bumped to ubuntu 16.04.
+ # --user is used because there is already a setuptools installation
+ # managed by apt.
+ pip install setuptools --upgrade --user
rm -rf fuel-plugin-bgpvpn
git clone $(BGPVPN_REPO)
cd fuel-plugin-bgpvpn; \
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
index ba6fb73ff..cd005e82f 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?=3349842af5724be63a74a82c9060848d9d3d299e
+BGPVPN_CHANGE?=cdf0ee0f60e417f37810d6c0074cd1eed4701bf5