diff options
| author | René Moser <mail@renemoser.net> | 2017-01-10 12:06:13 +0100 |
|---|---|---|
| committer | Rene Moser <mail@renemoser.net> | 2017-01-10 13:55:20 +0100 |
| commit | a47dcb6f8f3aeb732926f9b53b09805d96bb101e (patch) | |
| tree | 5f88afc1998066f6fff1ce4dfca1aaab1f5b0219 | |
| parent | 19d20ca1a0c47197b31337f47f4d2a142452f77a (diff) | |
| download | ansible-modules-extras-a47dcb6f8f3aeb732926f9b53b09805d96bb101e.tar.gz | |
cloudstack: cs_iso: fix async poll for state=absent (#20050)
(cherry picked from
https://github.com/ansible/ansible/commit/bcf9cd1e2a01d8e111a28db157ebc255a5592dca)
Edited to remove new argument poll_async in this backport.
| -rw-r--r-- | cloud/cloudstack/cs_iso.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cloud/cloudstack/cs_iso.py b/cloud/cloudstack/cs_iso.py index a61fb180..6aa06f89 100644 --- a/cloud/cloudstack/cs_iso.py +++ b/cloud/cloudstack/cs_iso.py @@ -240,6 +240,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 @@ -284,6 +286,9 @@ 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']) + self.poll_job(res, 'iso') return iso |