Merge "Fix relase file name for mixed upgrades"
This commit is contained in:
commit
5b578b3e55
|
@ -182,7 +182,7 @@ def shim_convert_old_release_names(releases_names):
|
|||
uc_install_release = releases_names['undercloud_install_release']
|
||||
|
||||
if oc_deploy_release != oc_target_release:
|
||||
release_file = "undercloud-{}-overcloud-{}".format(
|
||||
release_file = "{}-undercloud-{}-overcloud".format(
|
||||
uc_install_release, oc_deploy_release)
|
||||
releases_names['undercloud_install_release'] = release_file
|
||||
releases_names['undercloud_target_release'] = release_file
|
||||
|
|
|
@ -13,13 +13,13 @@ def test_converting_from_oc_upgrade_has_double_release():
|
|||
'overcloud_target_hash': 'current-tripleo',
|
||||
}
|
||||
expected_releases_file = {
|
||||
'undercloud_install_release': 'undercloud-master-overcloud-queens',
|
||||
'undercloud_install_release': 'master-undercloud-queens-overcloud',
|
||||
'undercloud_install_hash': 'current-tripleo',
|
||||
'undercloud_target_release': 'undercloud-master-overcloud-queens',
|
||||
'undercloud_target_release': 'master-undercloud-queens-overcloud',
|
||||
'undercloud_target_hash': 'current-tripleo',
|
||||
'overcloud_deploy_release': 'undercloud-master-overcloud-queens',
|
||||
'overcloud_deploy_release': 'master-undercloud-queens-overcloud',
|
||||
'overcloud_deploy_hash': 'current-tripleo',
|
||||
'overcloud_target_release': 'undercloud-master-overcloud-queens',
|
||||
'overcloud_target_release': 'master-undercloud-queens-overcloud',
|
||||
'overcloud_target_hash': 'current-tripleo',
|
||||
}
|
||||
assert (shim_convert_old_release_names(releases_name) ==
|
||||
|
|
Loading…
Reference in New Issue