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

phase3

Browse source
This commit is contained in:
deflax 2016-10-29 05:57:57 +03:00
parent 9c58388eb2
commit 16b6fe5073
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
grid.py
View file

@ -73,8 +73,9 @@ def sync(cached=True):
#static parameters that CAN go to to cache: #static parameters that CAN go to to cache:
vm_id = vm['vmid'] vm_id = vm['vmid']
vm_name = vm['name'] vm_name = vm['name']
vm_owner = clientsdb.vmowner(vm_id, vm_name, cached) #read clientsdb cache #vm_owner = clientsdb.vmowner(vm_id, vm_name, cached) #read clientsdb cache
static_vm = { "vmid":str(vm_id), "hostname":vm_name, 'type':vm['vmtype'], 'owner':vm_owner } #static_vm = { "vmid":str(vm_id), "hostname":vm_name, 'type':vm['vmtype'], 'owner':vm_owner }
static_vm = { "vmid":str(vm_id), "hostname":vm_name, 'type':vm['vmtype'] }
real_slave[str(vm_id)] = static_vm real_slave[str(vm_id)] = static_vm
#dynamic parameters that SHOULD NOT go to the cache: #dynamic parameters that SHOULD NOT go to the cache:
dynamic_vm = { "uptime":vm['uptime'] } dynamic_vm = { "uptime":vm['uptime'] }

2
plugin.py
View file

@ -58,7 +58,7 @@ def vmcreate(req):
region_id = grid.query_region(req['region']) region_id = grid.query_region(req['region'])
if region_id == "-1": if region_id == "-1":
logger.error('grid> no region found') ioconfig.logger.error('grid> no region found')
response = 'NO REGION FOUND' response = 'NO REGION FOUND'
return response return response