RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

tasks/calamari_setup: use ice_version to completely specify iceball

Browse Source 
Previously, the task would search for the lexicographically-greatest
filename matching ICE-*.tar.gz; now it builds a specific name
ICE-{ice_version}-{ice_distro}.tar.gz

Fixes: #10521
Signed-off-by: Dan Mick <dan.mick@redhat.com>
This commit is contained in:
Dan Mick 2015-01-12 16:36:14 -08:00
parent c3eee83fb0
commit 4377f00bac
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/calamari_setup.py
View File

@ -223,12 +223,7 @@ def calamari_install(config, cal_svr):
subprocess.check_call([exec_ice, '-b', version, '-o', ice_distro])
except subprocess.CalledProcessError:
raise RuntimeError('Unable to create %s distro' % ice_distro)
gz_file = ''
for file_loc in os.listdir(iceball_loc):
sfield = '^ICE-.*{0}\.tar\.gz$'.format(ice_distro)
if re.search(sfield, file_loc):
if file_loc > gz_file:
gz_file = file_loc
gz_file = 'ICE-{0}-{1}.tar.gz'.format(ice_version, ice_distro)
lgz_file = os.path.join(iceball_loc, gz_file)
cal_svr.put_file(lgz_file, os.path.join('/tmp/', gz_file))
ret = cal_svr.run(args=['gunzip', run.Raw('<'), "/tmp/%s" % gz_file,