shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-13 12:58:17 +03:00
Code Releases Wiki Activity

F #4913: Store in tmp file the host where a VM is deployed so VNC connections can establish even if the VM hasn't been monitored yet.

Browse Source
This commit is contained in:
mcabrerizo 2017-06-11 19:04:26 +02:00
parent 7b801cddbc
commit b6a306809a
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sunstone/OpenNebulaVNC.rb
View File

@ -99,6 +99,8 @@ VNC_STATES = [
#64 #DISK_RESIZE_UNDEPLOYED
]
VNC_ESX_HOST_FOLDER = "/tmp"
class OpenNebulaVNC
attr_reader :proxy_port
@ -211,8 +213,18 @@ class OpenNebulaVNC
vnc_port = vm_resource['TEMPLATE/GRAPHICS/PORT']
vnc_pw = vm_resource['TEMPLATE/GRAPHICS/PASSWD']
if vm_resource['MONITORING/VCENTER_ESX_HOST'] # It is behind a vCenter
host = vm_resource['MONITORING/VCENTER_ESX_HOST']
# If it is a vCenter VM
if vm_resource['USER_TEMPLATE/HYPERVISOR'] == "vcenter"
if vm_resource['MONITORING/VCENTER_ESX_HOST']
host = vm_resource['MONITORING/VCENTER_ESX_HOST']
else
# F#4242 get ESX host from file if it hasn't been monitored yet
begin
host = File.read(File.join(VNC_ESX_HOST_FOLDER, "vcenter_vnc_#{vm_resource["/VM/ID"]}"))
rescue
return error(400,"Could not determine the vCenter ESX host where the VM is running. Wait till the VCENTER_ESX_HOST attribute is retrieved once the host has been monitored")
end
end
end
# Generate token random_str: host:port