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

Ovirt vm state running wait false (#51024)

Browse source 
* ovirt change wait when state running

* add seting vm wait before creating module

* update wait for running vm

* ovirt vm sanity pylint correction

* ovirt add wait create

* update pep8 snytax

* update pep8 snytax 2
This commit is contained in:
Martin Nečas 2019-02-04 15:52:37 +01:00 committed by John R Barker
parent 70497df8d6
commit e0de42fe48
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/module_utils/ovirt.py
View file

@ -541,6 +541,7 @@ class BaseModule(object):
fail_condition=lambda e: False,
search_params=None,
update_params=None,
_wait=None,
**kwargs
):
"""
@ -621,7 +622,7 @@ class BaseModule(object):
service=entity_service,
condition=state_condition,
fail_condition=fail_condition,
wait=self._module.params['wait'],
wait=_wait if _wait is not None else self._module.params['wait'],
timeout=self._module.params['timeout'],
poll_interval=self._module.params['poll_interval'],
)

2
lib/ansible/modules/cloud/ovirt/ovirt_vm.py
View file

@ -2087,6 +2087,7 @@ def main():
if module.params['xen'] or module.params['kvm'] or module.params['vmware']:
vms_module.changed = import_vm(module, connection)
# In case of wait=false and state=running, waits for VM to be created
# In case VM don't exist, wait for VM DOWN state,
# otherwise don't wait for any state, just update VM:
ret = vms_module.create(
@ -2095,6 +2096,7 @@ def main():
update_params={'next_run': module.params['next_run']} if module.params['next_run'] is not None else None,
clone=module.params['clone'],
clone_permissions=module.params['clone_permissions'],
_wait=True if not module.params['wait'] and state == 'running' else module.params['wait'],
)
# If VM is going to be created and check_mode is on, return now:
if module.check_mode and ret.get('id') is None: