fixing acpi shutdown and vnc timeoute
This commit is contained in:
parent
80475657bd
commit
8bba4a75b2
|
@ -172,9 +172,9 @@ def vmshutdown(vm_id):
|
||||||
ioconfig.logger.info('slave[%s]> acpi shutdown %s %s' % (slave_name, vm_type, vm_id))
|
ioconfig.logger.info('slave[%s]> acpi shutdown %s %s' % (slave_name, vm_type, vm_id))
|
||||||
|
|
||||||
if vm_type == 'kvm':
|
if vm_type == 'kvm':
|
||||||
result = proxobject.nodes(slave_name).qemu(vm_id).status.stop.post()
|
result = proxobject.nodes(slave_name).qemu(vm_id).status.shutdown.post()
|
||||||
if vm_type == 'lxc':
|
if vm_type == 'lxc':
|
||||||
result = proxobject.nodes(slave_name).lxc(vm_id).status.stop.post()
|
result = proxobject.nodes(slave_name).lxc(vm_id).status.shutdown.post()
|
||||||
#ioconfig.logger.info('slave[{}]> {}'.format(slave_name, result))
|
#ioconfig.logger.info('slave[{}]> {}'.format(slave_name, result))
|
||||||
response = { 'status':'SHUTDOWN', 'vmid':vm_id }
|
response = { 'status':'SHUTDOWN', 'vmid':vm_id }
|
||||||
return response
|
return response
|
||||||
|
@ -284,7 +284,7 @@ def vmvnc(vm_id):
|
||||||
'listen_port': listenport
|
'listen_port': listenport
|
||||||
}
|
}
|
||||||
|
|
||||||
vnc_options = { 'idle-timeout': 10,
|
vnc_options = { 'idle-timeout': 20,
|
||||||
'verbose': True
|
'verbose': True
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue