Merge "Overcloud image has missing kernel_id and ramdisk_id properties" into stable/ussuri
This commit is contained in:
commit
f89254a2c2
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue