summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Short <zulcss@ubuntu.com>2011-03-17 08:54:05 -0400
committerChuck Short <zulcss@ubuntu.com>2011-03-17 08:54:05 -0400
commit6bd017262a5c61d915ede2e58ef2758f1f190ff3 (patch)
treeaf1885d9425267c17239c49d4604407c4237798d
parentc98cead470f33041e928a6f82be801efeb94ccc3 (diff)
downloadnova-6bd017262a5c61d915ede2e58ef2758f1f190ff3.tar.gz
nova-6bd017262a5c61d915ede2e58ef2758f1f190ff3.tar.xz
nova-6bd017262a5c61d915ede2e58ef2758f1f190ff3.zip
Remove target_partition for setup_container but still hardcode because its
needed when you inject the keys into the image.
-rw-r--r--nova/virt/libvirt_conn.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 9e0d0538d..0ca27d629 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -700,8 +700,7 @@ class LibvirtConnection(object):
if FLAGS.libvirt_type == 'lxc':
disk.setup_container(basepath('disk'),
container_dir=container_dir,
- partition=target_partition,
- nbd=FLAGS.use_cow_images)
+ partition=target_partition)
except Exception as e:
# This could be a windows image, or a vmdk format disk
LOG.warn(_('instance %(inst_name)s: ignoring error injecting'