openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Improve the error message about image tags"

This commit is contained in:
Zuul 2020-11-18 13:40:02 +00:00 committed by Gerrit Code Review
parent d6bd04edf5 8afc8de25e
commit 8f62f9d844
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tripleoclient/v1/overcloud_image.py
View File

@ -607,12 +607,17 @@ class UploadOvercloudImage(command.Command):
img_ramdisk_id = self.adapter.get_image_property(
overcloud_image, 'ramdisk_id')
# check overcloud image links
if (img_kernel_id != kernel.id or
img_ramdisk_id != ramdisk.id):
self.log.error('Link overcloud image to it\'s initrd and '
'kernel images is MISSING OR leads to OLD '
'image. You can keep it or fix it '
'manually.')
if img_kernel_id is None or img_ramdisk_id is None:
self.log.error('Link of overcloud image %s to its initrd'
' or kernel images is MISSING.'
'You can keep it or fix it manually.' %
overcloud_image.name)
elif (img_kernel_id != kernel.id or
img_ramdisk_id != ramdisk.id):
self.log.error('Link of overcloud image %s to its initrd'
' or kernel images leads to OLD image.'
'You can keep it or fix it manually.' %
overcloud_image.name)
else:
overcloud_image = self.adapter.update_or_upload(