archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

one_vm: Fix creating VM also for template_id=0 (#63579)

Browse Source
pull/64775/head
Jan Orel 6 years ago committed by ansibot
parent 7ea1db89d3
commit 6e19e341b0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
lib/ansible/modules/cloud/opennebula/one_vm.py
Unescape Escape View File

@ -644,7 +644,7 @@ def get_template_by_id(module, client, template_id):
def get_template_id(module, client, requested_id, requested_name): def get_template_id(module, client, requested_id, requested_name):
template = get_template_by_id(module, client, requested_id) if requested_id else get_template_by_name(module, client, requested_name) template = get_template_by_id(module, client, requested_id) if requested_id is not None else get_template_by_name(module, client, requested_name)
if template: if template:
return template.ID return template.ID
else: else:
@ -1430,10 +1430,10 @@ def main():
# Fetch template # Fetch template
template_id = None template_id = None
if requested_template_id or requested_template_name: if requested_template_id is not None or requested_template_name:
template_id = get_template_id(module, one_client, requested_template_id, requested_template_name) template_id = get_template_id(module, one_client, requested_template_id, requested_template_name)
if template_id is None: if template_id is None:
if requested_template_id: if requested_template_id is not None:
module.fail_json(msg='There is no template with template_id: ' + str(requested_template_id)) module.fail_json(msg='There is no template with template_id: ' + str(requested_template_id))
elif requested_template_name: elif requested_template_name:
module.fail_json(msg="There is no template with name: " + requested_template_name) module.fail_json(msg="There is no template with name: " + requested_template_name)

Write Preview
Loading…
Cancel
Save