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

Merge pull request #36797 from mgfritch/cephadm-infer-image-no-tag

Browse Source 
cephadm: infer latest image with a valid tag

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
This commit is contained in:
Sebastian Wagner 2020-08-27 12:03:23 +02:00 committed by GitHub
commit 63c7e27072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cephadm/cephadm
View File

@ -1226,12 +1226,12 @@ def get_last_local_ceph_image():
[container_path, 'images',
'--filter', 'label=ceph=True',
'--format', '{{.Repository}} {{.Tag}}'])
out_lines = out.splitlines()
if len(out_lines) > 0:
repository, tag = out_lines[0].split()
r = '{}:{}'.format(repository, tag)
logger.info('Using recent ceph image %s' % r)
return r
for line in out.splitlines():
if len(line.split()) == 2:
repository, tag = line.split()
r = '{}:{}'.format(repository, tag)
logger.info('Using recent ceph image %s' % r)
return r
return None