Merge "Fix ssl cert upload path"

[fuel.git] / build / f_isoroot / f_odlpluginbuild / config.mk

diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
index 876998c..6d176fb 100644 (file)
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
@@ -7,15 +7,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-ODL_BRANCH ?= master
-ODL_CHANGE ?= 1c8443ffc64af120337740551307378d1c21535d
-ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
+FUEL_PLUGIN_ODL_BRANCH ?= master
+FUEL_PLUGIN_ODL_CHANGE ?= 32b7edbde866b6a4c1c61e674ddf01a93dd010a2 
+FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
 
-FPB_BRANCH ?= master
-FPB_CHANGE ?= 82191ca16b40021e445e854fad37c65cd8e70b0c
-FPB_REPO ?= https://github.com/openstack/fuel-plugins
-
-export USE_JAVA8?=true
-export JAVA8_URL?=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
-export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz
-export ODL_VERSION_NUMBER?=0.4.2
+export OPNFV_BUILD?=true
+export ODL_VERSIONS?=5.0.0.1 5.2.0.1