cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Implement template storage selection (#2755)

Browse source
This commit is contained in:
alxsey 2016-08-30 10:17:30 -04:00 committed by René Moser
parent 582e36aef9
commit 035367170c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cloud/misc/proxmox.py
View file

@ -214,8 +214,8 @@ VZ_TYPE=None
def get_instance(proxmox, vmid): def get_instance(proxmox, vmid):
return [ vm for vm in proxmox.cluster.resources.get(type='vm') if vm['vmid'] == int(vmid) ] return [ vm for vm in proxmox.cluster.resources.get(type='vm') if vm['vmid'] == int(vmid) ]
def content_check(proxmox, node, ostemplate, storage): def content_check(proxmox, node, ostemplate, template_store):
return [ True for cnt in proxmox.nodes(node).storage(storage).content.get() if cnt['volid'] == ostemplate ] return [ True for cnt in proxmox.nodes(node).storage(template_store).content.get() if cnt['volid'] == ostemplate ]
def node_check(proxmox, node): def node_check(proxmox, node):
return [ True for nd in proxmox.nodes.get() if nd['node'] == node ] return [ True for nd in proxmox.nodes.get() if nd['node'] == node ]
@ -339,6 +339,8 @@ def main():
memory = module.params['memory'] memory = module.params['memory']
swap = module.params['swap'] swap = module.params['swap']
storage = module.params['storage'] storage = module.params['storage']
if module.params['ostemplate'] is not None:
template_store = module.params['ostemplate'].split(":")[0]
timeout = module.params['timeout'] timeout = module.params['timeout']
# If password not set get it from PROXMOX_PASSWORD env # If password not set get it from PROXMOX_PASSWORD env
@ -364,9 +366,9 @@ def main():
module.fail_json(msg='node, hostname, password and ostemplate are mandatory for creating vm') module.fail_json(msg='node, hostname, password and ostemplate are mandatory for creating vm')
elif not node_check(proxmox, node): elif not node_check(proxmox, node):
module.fail_json(msg="node '%s' not exists in cluster" % node) module.fail_json(msg="node '%s' not exists in cluster" % node)
elif not content_check(proxmox, node, module.params['ostemplate'], storage): elif not content_check(proxmox, node, module.params['ostemplate'], template_store):
module.fail_json(msg="ostemplate '%s' not exists on node %s and storage %s" module.fail_json(msg="ostemplate '%s' not exists on node %s and storage %s"
% (module.params['ostemplate'], node, storage)) % (module.params['ostemplate'], node, template_store))
create_instance(module, proxmox, vmid, node, disk, storage, cpus, memory, swap, timeout, create_instance(module, proxmox, vmid, node, disk, storage, cpus, memory, swap, timeout,
password = module.params['password'], password = module.params['password'],