wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

proxmox_template | fixed problem with uploading

Browse source
This commit is contained in:
Sergei Antipov 2015-06-02 18:21:36 +06:00 committed by Matt Clay
parent 3615776422
commit 79cee59b5b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/extras/cloud/misc/proxmox_template.py
View file

@ -129,10 +129,10 @@ def get_template(proxmox, node, storage, content_type, template):
def get_content(proxmox, node, storage): def get_content(proxmox, node, storage):
return proxmox.nodes(node).storage(storage).content.get() return proxmox.nodes(node).storage(storage).content.get()
def upload_template(module, proxmox, node, storage, content_type, realpath, timeout): def upload_template(module, proxmox, api_host, node, storage, content_type, realpath, timeout):
taskid = proxmox.nodes(node).storage(storage).upload.post(content=content_type, filename=open(realpath)) taskid = proxmox.nodes(node).storage(storage).upload.post(content=content_type, filename=open(realpath))
while timeout: while timeout:
task_status = proxmox.nodes(node).tasks(taskid).status.get() task_status = proxmox.nodes(api_host.split('.')[0]).tasks(taskid).status.get()
if task_status['status'] == 'stopped' and task_status['exitstatus'] == 'OK': if task_status['status'] == 'stopped' and task_status['exitstatus'] == 'OK':
return True return True
timeout = timeout - 1 timeout = timeout - 1
@ -213,7 +213,7 @@ def main():
elif not (os.path.exists(realpath) and os.path.isfile(realpath)): elif not (os.path.exists(realpath) and os.path.isfile(realpath)):
module.fail_json(msg='template file on path %s not exists' % realpath) module.fail_json(msg='template file on path %s not exists' % realpath)
if upload_template(module, proxmox, node, storage, content_type, realpath, timeout): if upload_template(module, proxmox, api_host, node, storage, content_type, realpath, timeout):
module.exit_json(changed=True, msg='template with volid=%s:%s/%s uploaded' % (storage, content_type, template)) module.exit_json(changed=True, msg='template with volid=%s:%s/%s uploaded' % (storage, content_type, template))
except Exception, e: except Exception, e:
module.fail_json(msg="uploading of template %s failed with exception: %s" % ( template, e )) module.fail_json(msg="uploading of template %s failed with exception: %s" % ( template, e ))