diff --git a/changelogs/fragments/79690-normal-action-undefined.yml b/changelogs/fragments/79690-normal-action-undefined.yml new file mode 100644 index 00000000000..bc22f70f0b1 --- /dev/null +++ b/changelogs/fragments/79690-normal-action-undefined.yml @@ -0,0 +1,2 @@ +bugfixes: + - "normal action plugin - remove obsolete ``if`` (https://github.com/ansible/ansible/pull/79690)." diff --git a/lib/ansible/plugins/action/normal.py b/lib/ansible/plugins/action/normal.py index cb91521ac5a..a8679f2c696 100644 --- a/lib/ansible/plugins/action/normal.py +++ b/lib/ansible/plugins/action/normal.py @@ -33,24 +33,15 @@ class ActionModule(ActionBase): result = super(ActionModule, self).run(tmp, task_vars) del tmp # tmp no longer has any effect - if not result.get('skipped'): + wrap_async = self._task.async_val and not self._connection.has_native_async - if result.get('invocation', {}).get('module_args'): - # avoid passing to modules in case of no_log - # should not be set anymore but here for backwards compatibility - del result['invocation']['module_args'] + # do work! + result = merge_hash(result, self._execute_module(task_vars=task_vars, wrap_async=wrap_async)) - # FUTURE: better to let _execute_module calculate this internally? - wrap_async = self._task.async_val and not self._connection.has_native_async - - # do work! - result = merge_hash(result, self._execute_module(task_vars=task_vars, wrap_async=wrap_async)) - - # hack to keep --verbose from showing all the setup module result - # moved from setup module as now we filter out all _ansible_ from result - # FIXME: is this still accurate with gather_facts etc, or does it need support for FQ and other names? - if self._task.action in C._ACTION_SETUP: - result['_ansible_verbose_override'] = True + # hack to keep --verbose from showing all the setup module result + # moved from setup module as now we filter out all _ansible_ from result + if self._task.action in C._ACTION_SETUP: + result['_ansible_verbose_override'] = True if not wrap_async: # remove a temporary path we created