diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2016-10-12 07:59:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-12 07:59:19 +0000 |
| commit | 2aa16d139a228abe9edb863ad94f542358098545 (patch) | |
| tree | 4547b954aeb055ce8644bf5e6801d6a747857d1e | |
| parent | aa912dc6691fba23c0827108f6a20296942e1ac0 (diff) | |
| parent | e1314e2e599cfff5625b8e4694832b731a663887 (diff) | |
Merge "[ODL] Use OpenDaylight Boron"
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/config.mk | 7 | ||||
| -rw-r--r-- | deploy/config/plugins/fuel-odl_0.9.0.yaml | 4 |
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: |