Merge lp:~vishvananda/nova/lp838154-ms into lp:~hudson-openstack/nova/milestone-proposed

Proposed by Vish Ishaya
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1191
Merged at revision: 1193
Proposed branch: lp:~vishvananda/nova/lp838154-ms
Merge into: lp:~hudson-openstack/nova/milestone-proposed
Diff against target: 23 lines (+5/-4)
1 file modified
nova/virt/libvirt/connection.py (+5/-4)
To merge this branch: bzr merge lp:~vishvananda/nova/lp838154-ms
Reviewer Review Type Date Requested Status
OpenStack release team Pending
Review via email: mp+76227@code.launchpad.net

Description of the change

Authorize to start a LXC instance withour, key, network file to inject or metadata.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/libvirt/connection.py'
2--- nova/virt/libvirt/connection.py 2011-09-19 21:01:27 +0000
3+++ nova/virt/libvirt/connection.py 2011-09-20 14:33:25 +0000
4@@ -1000,15 +1000,16 @@
5 nbd=FLAGS.use_cow_images,
6 tune2fs=tune2fs)
7
8- if FLAGS.libvirt_type == 'lxc':
9- disk.setup_container(basepath('disk'),
10- container_dir=container_dir,
11- nbd=FLAGS.use_cow_images)
12 except Exception as e:
13 # This could be a windows image, or a vmdk format disk
14 LOG.warn(_('instance %(inst_name)s: ignoring error injecting'
15 ' data into image %(img_id)s (%(e)s)') % locals())
16
17+ if FLAGS.libvirt_type == 'lxc':
18+ disk.setup_container(basepath('disk'),
19+ container_dir=container_dir,
20+ nbd=FLAGS.use_cow_images)
21+
22 if FLAGS.libvirt_type == 'uml':
23 utils.execute('chown', 'root', basepath('disk'), run_as_root=True)
24

Subscribers

People subscribed via source and target branches