openstack
/
nova
Code Issues Proposed changes

Merge "Use disk image path to setup lxc and uml container" into stable/folsom

This commit is contained in:
Jenkins 2012-11-26 13:06:02 +00:00 committed by Gerrit Code Review
parent 1351c6b424 b27f7ef926
commit d42a505796
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/virt/libvirt/driver.py
View File

@ -1432,12 +1432,12 @@ class LibvirtDriver(driver.ComputeDriver):
instance=instance)
if FLAGS.libvirt_type == 'lxc':
disk.setup_container(basepath('disk'),
disk.setup_container(image('disk').path,
container_dir=container_dir,
use_cow=FLAGS.use_cow_images)
if FLAGS.libvirt_type == 'uml':
libvirt_utils.chown(basepath('disk'), 'root')
libvirt_utils.chown(image('disk').path, 'root')
@staticmethod
def _volume_in_mapping(mount_device, block_device_info):