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

ovirt_templates: wait for OK state when importing (#31634)

Browse source
This commit is contained in:
Ondra Machacek 2017-11-02 14:24:42 +01:00 committed by Ryan Brown
parent 1c0dd5406b
commit ee26ecfcfd
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -746,14 +746,14 @@ class BaseModule(object):
'diff': self._diff,
}
def wait_for_import(self):
def wait_for_import(self, condition=lambda e: True):
if self._module.params['wait']:
start = time.time()
timeout = self._module.params['timeout']
poll_interval = self._module.params['poll_interval']
while time.time() < start + timeout:
entity = self.search_entity()
if entity:
if entity and condition(entity):
return entity
time.sleep(poll_interval)

5
lib/ansible/modules/cloud/ovirt/ovirt_templates.py
View file

@ -351,7 +351,10 @@ def main():
) if module.params['cluster'] else None,
**kwargs
)
template = templates_module.wait_for_import()
# Wait for template to appear in system:
template = templates_module.wait_for_import(
condition=lambda t: t.status == otypes.TemplateStatus.OK
)
ret = {
'changed': True,
'id': template.id,