diff options
| author | Thuleau Édouard <thuleau@gmail.com> | 2011-09-09 15:21:00 +0200 |
|---|---|---|
| committer | Thuleau Édouard <thuleau@gmail.com> | 2011-09-09 15:21:00 +0200 |
| commit | e1d38ca90c259a44035cf3bd5ad17d9ca5d93472 (patch) | |
| tree | 0ac03e6767c66df214bd333ec27e6c731f67094c | |
| parent | 9975c680fadf0a75639452db308e70a4be18c45d (diff) | |
| download | nova-e1d38ca90c259a44035cf3bd5ad17d9ca5d93472.tar.gz nova-e1d38ca90c259a44035cf3bd5ad17d9ca5d93472.tar.xz nova-e1d38ca90c259a44035cf3bd5ad17d9ca5d93472.zip | |
Authorize to start a LXC instance withour, key, network file to inject or metadata.
| -rw-r--r-- | nova/virt/libvirt/connection.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 363a20ed0..fc060703a 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -981,15 +981,16 @@ class LibvirtConnection(driver.ComputeDriver): nbd=FLAGS.use_cow_images, tune2fs=tune2fs) - if FLAGS.libvirt_type == 'lxc': - disk.setup_container(basepath('disk'), - container_dir=container_dir, - nbd=FLAGS.use_cow_images) except Exception as e: # This could be a windows image, or a vmdk format disk LOG.warn(_('instance %(inst_name)s: ignoring error injecting' ' data into image %(img_id)s (%(e)s)') % locals()) + if FLAGS.libvirt_type == 'lxc': + disk.setup_container(basepath('disk'), + container_dir=container_dir, + nbd=FLAGS.use_cow_images) + if FLAGS.libvirt_type == 'uml': utils.execute('chown', 'root', basepath('disk'), run_as_root=True) |