diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-06 17:39:10 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-06 17:39:10 -0400 |
| commit | b8597ec9f1cc4336487181d8f024010fa3aa7fd1 (patch) | |
| tree | 8d1ae85e925e157ab0bcd78ee17327482bde6cea /nova/virt | |
| parent | a64e2d9db1c7ba83424a5d0c377a3180026d5401 (diff) | |
| parent | 7bd99e33796f1e90b6f8b0b9caa122c541f99015 (diff) | |
Merged trunk.
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt_conn.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index bc9a031f9..968442e3a 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -859,7 +859,7 @@ class LibvirtConnection(driver.ComputeDriver): for (network_ref, mapping) in network_info: ifc_num += 1 - if not 'injected' in network_ref: + if not network_ref['injected']: continue have_injected_networks = True @@ -987,7 +987,8 @@ class LibvirtConnection(driver.ComputeDriver): 'nics': nics} if FLAGS.vnc_enabled: - xml_info['vncserver_host'] = FLAGS.vncserver_host + if FLAGS.libvirt_type != 'lxc': + xml_info['vncserver_host'] = FLAGS.vncserver_host if not rescue: if instance['kernel_id']: xml_info['kernel'] = xml_info['basepath'] + "/kernel" |