openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Overcloud image has missing kernel_id and ramdisk_id properties" into stable/ussuri

This commit is contained in:
Zuul 2021-05-03 22:44:35 +00:00 committed by Gerrit Code Review
parent bb0ec2034a 65ac1e1d15
commit f89254a2c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/v1/overcloud_image.py
View File

@ -184,12 +184,12 @@ class FileImageClientAdapter(BaseClientAdapter):
def get_image_property(self, image, prop): def get_image_property(self, image, prop):
if prop == 'kernel_id': if prop == 'kernel_id':
path = os.path.splitext(image.id)[0] + '.vmlinuz' path = os.path.splitext(image.id)[0] + '.vmlinuz'
if os.path.exists(path): if os.path.exists(path.replace("file://", "")):
return path return path
return None return None
elif prop == 'ramdisk_id': elif prop == 'ramdisk_id':
path = os.path.splitext(image.id)[0] + '.initrd' path = os.path.splitext(image.id)[0] + '.initrd'
if os.path.exists(path): if os.path.exists(path.replace("file://", "")):
return path return path
return None return None
raise ValueError('Unsupported property %s' % prop) raise ValueError('Unsupported property %s' % prop)