OpenStack Compute (nova)

Merge lp:~sleepsonthefloor/nova/lp825288 into lp:~hudson-openstack/nova/trunk

  1. lp825288
  2. Merge into trunk
Proposed by Anthony Young
Status: Merged
Approved by: Jesse Andrews
Approved revision: 1421
Merged at revision: 1422
Proposed branch: lp:~sleepsonthefloor/nova/lp825288
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
nova/virt/xenapi/vmops.py (+1/-1)
To merge this branch: bzr merge lp:~sleepsonthefloor/nova/lp825288
Reviewer Review Type Date Requested Status
Jesse Andrews (community) Approve
Josh Kearney (community) Approve
Review via email: mp+71388@code.launchpad.net

Description of the change

Fix a typo that causes ami images to launch with a kernel as ramdisk when using xen.

To post a comment you must log in.
Revision history for this message
Josh Kearney (jk0) wrote :

LGTM

review: Approve
Revision history for this message
Jesse Andrews (anotherjesse) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/xenapi/vmops.py'
2--- nova/virt/xenapi/vmops.py 2011-08-11 12:34:04 +0000
3+++ nova/virt/xenapi/vmops.py 2011-08-12 15:46:33 +0000
4@@ -186,7 +186,7 @@
5 instance.project_id, ImageType.KERNEL)[0]
6 if instance.ramdisk_id:
7 ramdisk = VMHelper.fetch_image(context, self._session,
8- instance.id, instance.kernel_id, instance.user_id,
9+ instance.id, instance.ramdisk_id, instance.user_id,
10 instance.project_id, ImageType.RAMDISK)[0]
11 # Create the VM ref and attach the first disk
12 first_vdi_ref = self._session.call_xenapi('VDI.get_by_uuid',