9 files changed, 18 insertions, 11 deletions
diff --git a/build/Makefile b/build/Makefile
index d4b981a9d..6ce6dbd9c 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -184,7 +184,7 @@ deepclean: clean clean-cache
 	docker rmi opnfv.org/ubuntu-builder:14.04 &>/dev/null || exit 0
 	docker rmi opnfv.org/ubuntu-builder:latest &>/dev/null || exit 0
 	docker rmi ubuntu:14.04 &>/dev/null || exit 0
-	@if docker images | grep -q "ubuntu *14.04"; then \
+	@if docker images | grep -q "^ubuntu *14.04"; then \
 		echo "Error: ubuntu:14.04 still present!"; \
 		exit 1; \
 	fi
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 5b80eb684..e41d5ec28 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-get install -y software-properties-common python-software-properties \
     build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
 
 RUN gem install fpm
-RUN pip install fuel-plugin-builder
+RUN pip install git+https://github.com/openstack/fuel-plugins
 # fuel-infra key
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BCE5CC461FA22B08
 
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 220bc9dbe..617e36515 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
+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_odlpluginbuild 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
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
index 5bf1368d1..ef51dbb8e 100644
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
@@ -8,6 +8,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-COLLECTD_CEILOMETER_BRANCH?=
+COLLECTD_CEILOMETER_BRANCH?=master
 COLLECTD_CEILOMETER_REPO?=http://gerrit.opnfv.org/gerrit/barometer
-COLLECTD_CEILOMETER_CHANGE?=refs/changes/13/26213/7
+COLLECTD_CEILOMETER_CHANGE?=dcc677f1446de60773d5f89dc0c0711968045822
diff --git a/build/f_isoroot/f_congress-pluginbuild/config.mk b/build/f_isoroot/f_congress-pluginbuild/config.mk
index b1a379502..5c241a127 100644
--- a/build/f_isoroot/f_congress-pluginbuild/config.mk
+++ b/build/f_isoroot/f_congress-pluginbuild/config.mk
@@ -9,4 +9,4 @@
 
 CONGRESS_BRANCH?=master
 CONGRESS_REPO?="https://github.com/openstack/fuel-plugin-congress"
-CONGRESS_CHANGE?=951a5ef26af16215b4bb7730c55c3c44fadb7cee
+CONGRESS_CHANGE?=adfa2db62988649219d64bd53746f2635d95aa43
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index bf811f25f..d3a7ea81c 100644
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -28,6 +28,7 @@ release:.odlbuild
 	cp gitinfo_odlplugin.txt $(BUILD_BASE)
 .odlbuild:
 	rm -rf fuel-plugin-opendaylight
+	../../docker/ubuntu-builder/install_docker.sh
 	git clone -b $(FUEL_PLUGIN_ODL_BRANCH) $(FUEL_PLUGIN_ODL_REPO)
 	cd fuel-plugin-opendaylight; \
 	if [ -n $(FUEL_PLUGIN_ODL_CHANGE) ]; then \
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
index 55facfe4f..2db9f55ef 100644
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
@@ -8,8 +8,8 @@
 ##############################################################################
 
 FUEL_PLUGIN_ODL_BRANCH ?= master
-FUEL_PLUGIN_ODL_CHANGE ?= 7281b0db9171e5aeda0c23ba655f086a909395a1
+FUEL_PLUGIN_ODL_CHANGE ?= 207f8627279cfd4aa2192c2d7ce39f3b00633bf5
 FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
 
-export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz
-export ODL_VERSION_NUMBER?=0.5.0
+export OPNFV_BUILD?=true
+export ODL_VERSIONS?=5.0.0.1 5.2.0.1