undersys/proxmaster
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixing acpi shutdown and vnc timeoute

Browse source
This commit is contained in:
deflax 2016-07-04 04:33:16 +03:00
parent 80475657bd
commit 8bba4a75b2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugin.py
View file

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