cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add missing self._supports_async to uri action plugin (#47677)

Browse source 
* Add missing self._supports_async to uri action plugin. Fixes #47660

* Additional changes needed to support async

* Missed a call to execute_module
This commit is contained in:
Matt Martz 2018-10-26 12:16:26 -05:00 committed by GitHub
parent 338605882e
commit 3633e21780
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/uri-supports-async.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- uri - Ensure the ``uri`` module supports async (https://github.com/ansible/ansible/issues/47660)

9
lib/ansible/plugins/action/uri.py
View file

@ -20,6 +20,8 @@ class ActionModule(ActionBase):
TRANSFERS_FILES = True
def run(self, tmp=None, task_vars=None):
self._supports_async = True
if task_vars is None:
task_vars = dict()
@ -33,7 +35,7 @@ class ActionModule(ActionBase):
if (src and remote_src) or not src:
# everything is remote, so we just execute the module
# without changing any of the module arguments
raise _AnsibleActionDone(result=self._execute_module(task_vars=task_vars))
raise _AnsibleActionDone(result=self._execute_module(task_vars=task_vars, wrap_async=self._task.async_val))
try:
src = self._find_needle('files', src)
@ -51,9 +53,10 @@ class ActionModule(ActionBase):
)
)
result.update(self._execute_module('uri', module_args=new_module_args, task_vars=task_vars))
result.update(self._execute_module('uri', module_args=new_module_args, task_vars=task_vars, wrap_async=self._task.async_val))
except AnsibleAction as e:
result.update(e.result)
finally:
self._remove_tmp_path(self._connection._shell.tmpdir)
if not self._task.async_val:
self._remove_tmp_path(self._connection._shell.tmpdir)
return result