diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-04-07 14:28:53 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-04-07 14:28:53 -0400 |
| commit | da1bfe96e614bd8d0d65442f6b797b002fe268cd (patch) | |
| tree | b6d91d990d9d39bee5f4d4cdf4a7d8818225e78a /nova/virt | |
| parent | 3bb6e627fd99a307825f88ff8882e974bcf1b365 (diff) | |
| parent | a782dad0d1effeaebdfb59ad87b88b42c93991ed (diff) | |
Merge w/ 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 099ef647c..db1dc1aaa 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -972,7 +972,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" |