From 7281b0db9171e5aeda0c23ba655f086a909395a1 Mon Sep 17 00:00:00 2001 From: Michal Skalski Date: Mon, 10 Oct 2016 22:48:55 +0200 Subject: [PATCH] Use ODL Beryllium when bgpvpn feature enabled Change-Id: I52cc5a67bebd8d49cc943b046c01042d1ec1e4f2 Signed-off-by: Michal Skalski --- environment_config.yaml | 1 + pre_build_hook | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/environment_config.yaml b/environment_config.yaml index 8a3b93e..f328908 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -107,6 +107,7 @@ attributes: odl_deb: opendaylight experimental_odl_deb: opendaylight-experimental use_experimental_odl: + - enable_bgpvpn default_credentials: user: admin password: admin diff --git a/pre_build_hook b/pre_build_hook index 0296821..2c0c5cb 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -19,7 +19,7 @@ fi # Where we can find odl karaf distribution tarball # can be http(s) url or absolute path ODL_TARBALL_LOCATION=${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} -ODL_EXPERIMENTAL_TARBALL_LOCATION=${ODL_EXPERIMENTAL_TARBALL_LOCATION:-false} +ODL_EXPERIMENTAL_TARBALL_LOCATION=${ODL_EXPERIMENTAL_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} ODL_EXPERIMENTAL_DEB_NAME=${ODL_EXPERIMENTAL_DEB_NAME:-opendaylight-experimental} #ODL openflowjava NSH subtype patch related @@ -41,7 +41,7 @@ bdart='' #Verion number used in deb/rpm package ODL_VERSION_NUMBER=${ODL_VERSION_NUMBER:-0.5.0} -ODL_EXPERIMENTAL_VERSION_NUMBER=${ODL_EXPERIMENTAL_VERSION_NUMBER:-0.5.0} +ODL_EXPERIMENTAL_VERSION_NUMBER=${ODL_EXPERIMENTAL_VERSION_NUMBER:-0.4.3} ODL_DESCRIPTION="OpenDaylight SDN Controller" TMP_NAME="karaf-odl.tar.gz"