From bcf9cd1e2a01d8e111a28db157ebc255a5592dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Moser?= Date: Tue, 10 Jan 2017 12:06:13 +0100 Subject: [PATCH] cloudstack: cs_iso: fix async poll for state=absent (#20050) --- lib/ansible/modules/cloud/cloudstack/cs_iso.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/ansible/modules/cloud/cloudstack/cs_iso.py b/lib/ansible/modules/cloud/cloudstack/cs_iso.py index ee84bd22f2c..42274f9c109 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_iso.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_iso.py @@ -109,6 +109,12 @@ options: required: false default: 'present' choices: [ 'present', 'absent' ] + poll_async: + description: + - Poll async jobs until job has finished. + required: false + default: true + version_added: "2.3" extends_documentation_fragment: cloudstack ''' @@ -244,6 +250,8 @@ class AnsibleCloudStackIso(AnsibleCloudStack): self.result['changed'] = True if not self.module.check_mode: res = self.cs.registerIso(**args) + if 'errortext' in res: + self.module.fail_json(msg="Failed: '%s'" % res['errortext']) iso = res['iso'][0] return iso @@ -288,6 +296,11 @@ class AnsibleCloudStackIso(AnsibleCloudStack): if not self.module.check_mode: res = self.cs.deleteIso(**args) + if 'errortext' in res: + self.module.fail_json(msg="Failed: '%s'" % res['errortext']) + poll_async = self.module.params.get('poll_async') + if poll_async: + self.poll_job(res, 'iso') return iso @@ -309,6 +322,7 @@ def main(): is_featured = dict(type='bool', default=False), is_dynamically_scalable = dict(type='bool', default=False), state = dict(choices=['present', 'absent'], default='present'), + poll_async = dict(type='bool', default=True), )) module = AnsibleModule(