diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2016-12-07 01:36:41 +0100 |
|---|---|---|
| committer |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-01-25 17:49:58 +0400 |
| commit | a6a9143adb96470425dae27e1f04910102770b34 (patch) | |
| tree | e0760054b1b777eae3580d3d74faaa1fcd4b3f7d /build | |
| parent | 1906a373372b7ddd7eeb181dbe69b204b209e584 (diff) | |
Uplift OpenDaylight plugin to Fuel 10
Currently only update pure odl scenarios because both sfc and bgpvpn
variants require additional plugins.
JIRA: FUEL-224
JIRA: FUEL-222
Change-Id: I9891029d3f6a4b6b124cca13caceaab6edb6ca6a
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/f_isoroot/Makefile | 4 | ||||
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/Makefile | 1 | ||||
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/config.mk | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index c21546ad3..890cfaf5a 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 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 f_bgpvpn-pluginbuild # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins # indicated therein. 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 |