Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix using ODL versions other than oxygen
[apex.git]
/
apex
/
builders
/
overcloud_builder.py
diff --git
a/apex/builders/overcloud_builder.py
b/apex/builders/overcloud_builder.py
index
a74ec25
..
eab8fb6
100644
(file)
--- 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':
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]
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
branch = odl_version
else:
odl_pkg_version = odl_version