diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-04-07 13:17:13 -0400 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-04-07 13:17:13 -0400 |
| commit | fb31d50e89bec43b6d8490d970f04d6341ef4859 (patch) | |
| tree | 741ecabf1b145c43b33241abae200df2484e1047 /nova/virt | |
| parent | 2b79fa82872c55368167fc7433cb28a2369f5191 (diff) | |
| parent | 7bd99e33796f1e90b6f8b0b9caa122c541f99015 (diff) | |
Merge trunk.
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt_conn.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 38ba21521..ae9e84120 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -970,7 +970,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" |