summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2015-11-19 16:42:20 +0100
committerMichal Skalski <mskalski@mirantis.com>2015-11-19 17:04:32 +0100
commit88105418b6283461c65bf33943d04b79238c01c1 (patch)
tree5686b1f3d44778a8c6eaf21caffcef4162ab2076
parent8c30ceacdcdea69d695d38cfba10a046f54a80b7 (diff)
Build OpenDaylight plugin for Fuel 7.0
Change-Id: Ifc529102b59d0aa3aa4b766cc592e7ee8c2eddc1
-rw-r--r--fuel/build/f_isoroot/Makefile4
-rw-r--r--fuel/build/f_isoroot/f_odlpluginbuild/Makefile3
2 files changed, 2 insertions, 5 deletions
diff --git a/fuel/build/f_isoroot/Makefile b/fuel/build/f_isoroot/Makefile
index 968806c53..3831a09f0 100644
--- a/fuel/build/f_isoroot/Makefile
+++ b/fuel/build/f_isoroot/Makefile
@@ -8,9 +8,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-SUBDIRS = f_kscfg f_bootstrap f_repobuild
-# Disable f_odlplugin waiting for Fuel 7 uplift
-#SUBDIRS += f_odlpluginbuild
+SUBDIRS = f_kscfg f_bootstrap f_repobuild f_odlpluginbuild
SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
.PHONY: all
diff --git a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile
index b5f7ea576..df75fc695 100644
--- a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -8,7 +8,7 @@
##############################################################################
TOP := $(shell pwd)
-ODL_BRANCH=juno/lithium-sr1
+ODL_BRANCH=7.0
ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
.PHONY: all
@@ -33,7 +33,6 @@ release:.odlbuild
sudo pip install fuel-plugin-builder
git clone -b $(ODL_BRANCH) $(ODL_REPO)
@$(BUILD_BASE)/check_dependencies.sh fuel-plugin-opendaylight/odl_package/ubuntu/dependencies.txt
- @$(BUILD_BASE)/check_dependencies.sh fuel-plugin-opendaylight/odl_package/centos/dependencies.txt
INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-opendaylight/
mv fuel-plugin-opendaylight/opendaylight*.rpm .
$(REPOINFO) -r . > gitinfo_odlplugin.txt