diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-12-07 09:49:21 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-12-08 03:04:47 +0000 |
| commit | c4ac31069c875b7f0922963194954aff4a5bb644 (patch) | |
| tree | 226b7e578e3e6fc2e6e3d9e448b1d56890d426c9 | |
| parent | f357aac22a1df2f10cca635c522e2397b2840f62 (diff) | |
Fix using ODL versions other than oxygen
Fixes a bug where oxygen was always being used even if a different ODL
version was specified in the deploy settings. Also updates the valid ODL
versions with fluorine and neon.
JIRA: APEX-648
Change-Id: Ie49c28d1757cd7e57802d67e48904ce04864feaf
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 46bf00b967844dc712dfe409e55fc5fe18fa119f)
| -rw-r--r-- | apex/builders/overcloud_builder.py | 5 | ||||
| -rw-r--r-- | apex/common/constants.py | 3 | ||||
| -rw-r--r-- | apex/settings/deploy_settings.py | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/apex/builders/overcloud_builder.py b/apex/builders/overcloud_builder.py index a74ec252..eab8fb66 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 790a9e30..02fafbd0 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 00e6d6c0..9f8a6f18 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" |