summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-10-06 15:12:34 +0200
committerMichal Skalski <mskalski@mirantis.com>2016-10-12 08:20:20 +0000
commitb47042641c215adcdce8ddaf587f23aa2215c71a (patch)
tree7773ca751537818c70a7a82106d4bc73200d9394
parenta446369271a7fb3ff14b72d7e0ea8d2226eeacff (diff)
[ODL] Use OpenDaylight Boron
ODL Boron will be used in all scenarios except bgpvpn beacuse vpnservice was removed in this release, we still will use Beryllium for this scenario. This change only replace Beryllium with Boron, it does not use any new features like odl-netvirt-openstack. Change-Id: I95264cc97f5b9e922ab3fb7dc024724d9fb83e9c Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit e1314e2e599cfff5625b8e4694832b731a663887)
-rw-r--r--build/f_isoroot/f_odlpluginbuild/config.mk7
-rw-r--r--deploy/config/plugins/fuel-odl_0.9.0.yaml4
2 files changed, 5 insertions, 6 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
index 7074ee2e0..55facfe4f 100644
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
@@ -8,9 +8,8 @@
##############################################################################
FUEL_PLUGIN_ODL_BRANCH ?= master
-FUEL_PLUGIN_ODL_CHANGE ?= 58cf41ff4e9ed928bf024b166776b9df1a2e517b
+FUEL_PLUGIN_ODL_CHANGE ?= 7281b0db9171e5aeda0c23ba655f086a909395a1
FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
-export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz
-export ODL_VERSION_NUMBER?=0.4.3
-export ODL_BORON_TARBALL_LOCATION?=http://artifacts.opnfv.org/fuel/colorado/vendor/distribution-karaf-0.5.0-Boron-RC3.5.tar.gz
+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
diff --git a/deploy/config/plugins/fuel-odl_0.9.0.yaml b/deploy/config/plugins/fuel-odl_0.9.0.yaml
index 6caf4834f..9646d021f 100644
--- a/deploy/config/plugins/fuel-odl_0.9.0.yaml
+++ b/deploy/config/plugins/fuel-odl_0.9.0.yaml
@@ -118,9 +118,9 @@ opendaylight:
vpn:
- odl-vpnservice-openstack
odl_deb: opendaylight
- experimental_odl_deb: opendaylight-boron
+ experimental_odl_deb: opendaylight-experimental
use_experimental_odl:
- - enable_sfc
+ - enable_bgpvpn
#plugin_id: Assigned during installation
plugin_version: 0.9.0
restrictions: