x/anvil
Code Issues Proposed changes

Fixed image ids (should be blank, not none for execute template to not puke)

Browse Source
This commit is contained in:
Joshua Harlow 2012-03-17 23:36:40 -07:00
parent c336908eeb
commit 1aa74de841
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/image/uploader.py
View File

@ -133,7 +133,7 @@ class Image(object):
# Upload the kernel, if we have one
kernel = locations.get('kernel')
kernel_id = None
kernel_id = ''
if kernel:
LOG.info('Adding kernel %r to glance.', kernel)
params = {'TOKEN': self.token, 'IMAGE_NAME': image_name}
@ -148,7 +148,7 @@ class Image(object):
# Upload the ramdisk, if we have one
initrd = locations.get('ramdisk')
initrd_id = None
initrd_id = ''
if initrd:
LOG.info('Adding ramdisk %r to glance.', initrd)
params = {'TOKEN': self.token, 'IMAGE_NAME': image_name}
@ -162,7 +162,7 @@ class Image(object):
initrd_id = stdout.split(':')[1].strip()
# Upload the root, we must have one...
img_id = None
img_id = ''
root_image = locations['image']
LOG.info('Adding image %r to glance.', root_image)
params = {'TOKEN': self.token, 'IMAGE_NAME': image_name,