diff options
| author |   Wojciech Dec <wdec@cisco.com> | 2016-08-17 13:14:23 +0200 |
|---|---|---|
| committer | Wojciech Dec <wdec@cisco.com> | 2016-08-17 13:14:23 +0200 |
| commit | 4979a23b8b2c0094ced98cf05eebb692d6609937 (patch) | |
| tree | c49ceeb5b127fdb0e10c0f5ac0516be96cbd31a9 /networking-odl/devstack/settings.odl | |
| parent | c3b2c2a9a22bac5cf17813c589444d3abebaa23b (diff) | |
Correcting networking-odl to mitaka/stable + app topology patch
Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035
Signed-off-by: Wojciech Dec <wdec@cisco.com>
Diffstat (limited to 'networking-odl/devstack/settings.odl')
| -rw-r--r-- | networking-odl/devstack/settings.odl | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/networking-odl/devstack/settings.odl b/networking-odl/devstack/settings.odl index 1ce23a4..5a1040b 100644 --- a/networking-odl/devstack/settings.odl +++ b/networking-odl/devstack/settings.odl @@ -3,21 +3,18 @@ # What release to use. Choices are: # -# carbon-snapshot-0.6.0 (master) -# boron-snapshot-0.5.0 (stable/boron) -# beryllium-snapshot-0.4.4 (stable/beryllium) -# beryllium-snapshot-0.4.3 (stable/beryllium) -# beryllium-0.4.3-SR3 -# beryllium-0.4.2-SR2 +# boron-snapshot-0.5.0 (master) +# beryllium-snapshot-0.4.2 (stable/beryllium) # beryllium-0.4.1-SR1 # beryllium-0.4.0 +# lithium-snapshot-0.3.5 (stable/lithium) # lithium-0.3.4-SR4 (SR4) # lithium-0.3.3-SR3 (SR3) # lithium-0.3.2-SR2 (SR2) # lithium-0.3.1-SR1 (SR1) # helium-0.2.3-SR3 -ODL_RELEASE=${ODL_RELEASE:-boron-snapshot-0.5.0} +ODL_RELEASE=${ODL_RELEASE:-beryllium-snapshot-0.4.2} # The IP address of ODL. Set this in local.conf. ODL_MGR_IP=${ODL_MGR_IP:-$SERVICE_HOST} @@ -45,18 +42,9 @@ ODL_USERNAME=${ODL_USERNAME:-admin} # The ODL password ODL_PASSWORD=${ODL_PASSWORD:-admin} -# use v2 type driver -# this requires post mitaka -ODL_V2DRIVER=${ODL_V2DRIVER:-False} - # The OpenDaylight URL PREFIX ODL_URL_PREFIX=${ODL_URL_PREFIX:-https://nexus.opendaylight.org} -# OpenDaylight snapshot & release repositories paths -# Can be overidden in case you host proxy repositories which have a different diretory structure than OpenDaylight's -ODL_URL_SNAPSHOT_REPOSITORY_PATH=${ODL_URL_SNAPSHOT_REPOSITORY_PATH:-content/repositories/opendaylight.snapshot} -ODL_URL_RELEASE_REPOSITORY_PATH=${ODL_URL_RELEASE_REPOSITORY_PATH:-content/repositories/opendaylight.release} - # How long (in seconds) to pause after ODL starts to let it complete booting ODL_BOOT_WAIT=${ODL_BOOT_WAIT:-600} @@ -102,15 +90,5 @@ ODL_RETRY_SLEEP_INTERVAL=${ODL_RETRY_SLEEP_INTERVAL:-5} # Skip installation of distribution provided Open vSwitch SKIP_OVS_INSTALL=$(trueorfalse False SKIP_OVS_INSTALL) -# The ODL Restconf URL -# URI to hostconfigs: empty for default value -ODL_HOSTCONF_URI=${ODL_HOSTCONF_URI:-} - # Port binding controller ODL_PORT_BINDING_CONTROLLER=${ODL_PORT_BINDING_CONTROLLER:-network-topology} - -# Snapshot version - allows using a specific version e.g. 0.5.0-20160719.101233-3643 -# latest: check the latest snapshot -# specific version: the specific version of the snapshot -# "": odl release -ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-} |