summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-12-08 18:35:19 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-12-08 18:35:19 +0000
commit387dab2bf2eb60ec6861ea398b5c8bfb4dad52d7 (patch)
tree1ef49a49f422356ac9985b383c2289d0cab1e086
parent8154d4c215974c9c51b901cc655faace6eca2f98 (diff)
parentc4ac31069c875b7f0922963194954aff4a5bb644 (diff)
Merge "Fix using ODL versions other than oxygen" into stable/gambia
-rw-r--r--apex/builders/overcloud_builder.py5
-rw-r--r--apex/common/constants.py3
-rw-r--r--apex/settings/deploy_settings.py3
3 files changed, 7 insertions, 4 deletions
diff --git a/apex/builders/overcloud_builder.py b/apex/builders/overcloud_builder.py
index a74ec25..eab8fb6 100644
--- a/apex/builders/overcloud_builder.py
+++ b/apex/builders/overcloud_builder.py
@@ -25,7 +25,12 @@ def inject_opendaylight(odl_version, image, tmp_dir, uc_ip,
assert odl_version in con.VALID_ODL_VERSIONS
# add repo
if odl_version == 'master':
+ # last version in the constants is "master" so select 2nd to last
+ # odl package version has no "master" version
odl_pkg_version = con.VALID_ODL_VERSIONS[-2]
+ # branch will be used to pull puppet-opendaylight. Since puppet-odl
+ # does not pull branch until later, we need to use master version of
+ # that if master ODL version is specified
branch = odl_version
else:
odl_pkg_version = odl_version
diff --git a/apex/common/constants.py b/apex/common/constants.py
index 790a9e3..02fafbd 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -46,7 +46,8 @@ THT_DOCKER_ENV_DIR = {
DEFAULT_OS_VERSION = 'queens'
DEFAULT_ODL_VERSION = 'oxygen'
-VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'master']
+VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'fluorine',
+ 'neon', 'master']
PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \
'/puppet-opendaylight'
DEBUG_OVERCLOUD_PW = 'opnfvapex'
diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py
index 00e6d6c..9f8a6f1 100644
--- a/apex/settings/deploy_settings.py
+++ b/apex/settings/deploy_settings.py
@@ -129,9 +129,6 @@ class DeploySettings(dict):
"Invalid SRIOV interface name: {}".format(
self['deploy_options']['sriov']))
- if self['deploy_options']['odl_version'] == 'oxygen':
- self['deploy_options']['odl_version'] = 'master'
-
if 'performance' in deploy_options:
if not isinstance(deploy_options['performance'], dict):
raise DeploySettingsException("Performance deploy_option"