diff options
| author | Chuck Short <zulcss@ubuntu.com> | 2011-04-05 17:42:38 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-04-05 17:42:38 +0000 |
| commit | 4eb3bbdee4952c9f198c52ba509800f408df9b6b (patch) | |
| tree | 570a0c697cbf5397c9faf8b0726ef6f4c9e9145b /nova | |
| parent | 2ba10bc869a716086fcdc5da91c43e67644ee58c (diff) | |
| parent | f1f8e00dc420bbc78b8d143c56375afc721c4c7d (diff) | |
| download | nova-4eb3bbdee4952c9f198c52ba509800f408df9b6b.tar.gz nova-4eb3bbdee4952c9f198c52ba509800f408df9b6b.tar.xz nova-4eb3bbdee4952c9f198c52ba509800f408df9b6b.zip | |
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
Diffstat (limited to 'nova')
| -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 babbc610d..2be190256 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" |