OpenStack Compute (nova)

Merge lp://qastaging/~vishvananda/nova/lp829020 into lp://qastaging/~hudson-openstack/nova/trunk

lp829020
Merge into trunk

Proposed by Vish Ishaya on 2011-09-14

Status:

Merged

Approved by:

Dan Prince on 2011-09-16

Approved revision:

1545

Merged at revision:

1581

Proposed branch:

lp://qastaging/~vishvananda/nova/lp829020

Merge into:

lp://qastaging/~hudson-openstack/nova/trunk

Diff against target:

132 lines (+40/-37)

1 file modified

nova/virt/libvirt/connection.py (+40/-37)

To merge this branch:

bzr merge lp://qastaging/~vishvananda/nova/lp829020

Wishlist

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Dan Prince (community)		Approve on 2011-09-16
Devin Carlen (community)	2011-09-14	Approve on 2011-09-15
Review via email: mp+75433@code.qastaging.launchpad.net

Description of the change

Fixes libvirt rescue to use the same strategy as xen. Use a new copy of the base image as the rescue image. It leaves the original rescue image flags in, so a hand picked rescue image can still be used if desired.

Revision history for this message

Devin Carlen (devcamcar) wrote on 2011-09-14:

You've got a merge conflict that needs to be resolved.

review: Needs Fixing

lp://qastaging/~vishvananda/nova/lp829020 updated on 2011-09-14

1543. By Vish Ishaya on 2011-09-14: write out xml for rescue
1544. By Vish Ishaya on 2011-09-14: merge trunk

Revision history for this message

Vish Ishaya (vishvananda) wrote on 2011-09-14:

devin: fixed

Revision history for this message

Devin Carlen (devcamcar) wrote on 2011-09-15:

lgtm

review: Approve

Revision history for this message

Dan Prince (dan-prince) wrote on 2011-09-16:

Hey Vish,

I'm getting some permissions issues when trying to go into rescue mode using libvirt:

2011-09-16 14:58:03,439 INFO nova.virt.libvirt_conn [-] instance instance-00000001: Creating image
2011-09-16 14:58:03,440 ERROR nova.exception [-] Uncaught exception
(nova.exception): TRACE: Traceback (most recent call last):
(nova.exception): TRACE: File "/usr/lib/pymodules/python2.6/nova/exception.py", line 98, in wrapped
(nova.exception): TRACE: return f(*args, **kw)
(nova.exception): TRACE: File "/usr/lib/pymodules/python2.6/nova/virt/libvirt/connection.py", line 564, in rescue
(nova.exception): TRACE: network_info=network_info)
(nova.exception): TRACE: File "/usr/lib/pymodules/python2.6/nova/virt/libvirt/connection.py", line 818, in _create_image
(nova.exception): TRACE: os.O_CREAT | os.O_WRONLY, 0660))
(nova.exception): TRACE: OSError: [Errno 13] Permission denied: '/var/lib/nova/instances/instance-00000001/console.log'