diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-12-07 09:49:21 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-12-07 09:49:21 -0500 |
| commit | 46bf00b967844dc712dfe409e55fc5fe18fa119f (patch) | |
| tree | 3efa3ab96872c1cc4859af74ae4ab7a18e09238f /apex/builders | |
| parent | 31e6f7f5529d04f12caabe804bfef305b5f263e8 (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>
Diffstat (limited to 'apex/builders')
| -rw-r--r-- | apex/builders/overcloud_builder.py | 5 |
1 files changed, 5 insertions, 0 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 |