external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-03-09 15:40:09 +00:00
Code Issues Releases Wiki Activity

only retrieve ignored_pools once, add paramter for get_pools in tasks

Browse source
This commit is contained in:
Jordan Rodgers 2018-02-03 00:05:20 -05:00
parent e96c8cf4cf
commit 85a5e74a6b
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
proxstar/proxmox.py
View file

@ -274,10 +274,10 @@ def mount_vm_iso(proxmox, vmid, iso):
def get_pools(proxmox, db): def get_pools(proxmox, db):
ignored_pools = get_ignored_pools(db)
pools = [] pools = []
for pool in proxmox.pools.get(): for pool in proxmox.pools.get():
poolid = pool['poolid'] poolid = pool['poolid']
ignored_pools = get_ignored_pools(db)
if poolid not in ignored_pools and is_user(poolid): if poolid not in ignored_pools and is_user(poolid):
pools.append(poolid) pools.append(poolid)
pools = sorted(pools) pools = sorted(pools)

2
proxstar/tasks.py
View file

@ -76,7 +76,7 @@ def process_expiring_vms_task():
proxmox = connect_proxmox() proxmox = connect_proxmox()
db = connect_db() db = connect_db()
starrs = connect_starrs() starrs = connect_starrs()
pools = get_pools(proxmox) pools = get_pools(proxmox, db)
for pool in pools: for pool in pools:
expiring_vms = [] expiring_vms = []
vms = get_vms_for_user(proxmox, db, pool) vms = get_vms_for_user(proxmox, db, pool)