openstack
/
nova
Code Issues Proposed changes

This branch contains the fix for lp:749973. VNC is assumed that is default for all in libvirt which LXC does not support yet. 

Regards
chuck
This commit is contained in:
Chuck Short 2011-04-05 17:42:38 +00:00 committed by Tarmac
parent 2ba10bc869 f1f8e00dc4
commit 4eb3bbdee4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/virt/libvirt_conn.py
View File

@ -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"