diff options
| author | Chuck Short <zulcss@ubuntu.com> | 2011-03-25 08:20:56 -0400 |
|---|---|---|
| committer | Chuck Short <zulcss@ubuntu.com> | 2011-03-25 08:20:56 -0400 |
| commit | 9632db75d229eac16970af1dfabbb047c2b71a4e (patch) | |
| tree | e360beabd1f48227c477ee30546dae647b04a5b2 | |
| parent | e4d796734c9195deb3ee3a15feb1a59f13a8f7f2 (diff) | |
| download | nova-9632db75d229eac16970af1dfabbb047c2b71a4e.tar.gz nova-9632db75d229eac16970af1dfabbb047c2b71a4e.tar.xz nova-9632db75d229eac16970af1dfabbb047c2b71a4e.zip | |
Removed partition from setup_container
| -rw-r--r-- | nova/virt/disk.py | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nova/virt/disk.py b/nova/virt/disk.py index 0bdb04cde..bbdcc8ddf 100644 --- a/nova/virt/disk.py +++ b/nova/virt/disk.py @@ -115,13 +115,13 @@ def inject_data(image, key=None, net=None, partition=None, nbd=False): _unlink_device(device, nbd) -def setup_container(image, container_dir=None, partition=None): +def setup_container(image, container_dir=None): """Setup the LXC container It will mount the loopback image to the container directory in order to create the root filesystem for the container """ - nbd = False + nbd = "False" device = _link_device(image, nbd) err = utils.execute('sudo', 'mount', device, container_dir) if err: diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 9fb8ba955..bfb0a75f1 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -798,8 +798,7 @@ class LibvirtConnection(driver.ComputeDriver): if FLAGS.libvirt_type == 'lxc': disk.setup_container(basepath('disk'), - container_dir=container_dir, - partition=target_partition) + container_dir=container_dir) except Exception as e: # This could be a windows image, or a vmdk format disk LOG.warn(_('instance %(inst_name)s: ignoring error injecting' |