summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorunicell <unicell@gmail.com>2012-11-17 13:43:45 +0800
committerunicell <unicell@gmail.com>2012-11-17 13:43:45 +0800
commit3b05ed5fdbf7d66d76f61a7cc470e123fbac7ebe (patch)
treed26132b9a21011d3394b319eb8b8668120142eea
parent4cd7311c128d55a8ad0e501ad1b7f5a1b5f7d12e (diff)
downloadnova-3b05ed5fdbf7d66d76f61a7cc470e123fbac7ebe.tar.gz
nova-3b05ed5fdbf7d66d76f61a7cc470e123fbac7ebe.tar.xz
nova-3b05ed5fdbf7d66d76f61a7cc470e123fbac7ebe.zip
Use disk image path to setup lxc container
fix bug 1079113 Change-Id: I9b9b10e77728d4d7863f49efc048c8a37b06953b
-rw-r--r--nova/virt/libvirt/driver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 94ce9f6f8..c6c4ddee6 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -1442,12 +1442,12 @@ class LibvirtDriver(driver.ComputeDriver):
instance=instance)
if CONF.libvirt_type == 'lxc':
- disk.setup_container(basepath('disk'),
+ disk.setup_container(image('disk').path,
container_dir=container_dir,
use_cow=CONF.use_cow_images)
if CONF.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):