Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix gather_facts error/skipped reporting #58927

Merged
merged 1 commit into from
Jul 11, 2019
Merged

Fix gather_facts error/skipped reporting #58927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/fix_gathering_reporting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- gather_facts now correctly passes back the full output of modules on error and skipped, fixes #57204
14 changes: 6 additions & 8 deletions lib/ansible/plugins/action/gather_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ def run(self, tmp=None, task_vars=None):
mod_args = self._get_module_args(fact_module, task_vars)
res = self._execute_module(module_name=fact_module, module_args=mod_args, task_vars=task_vars, wrap_async=False)
if res.get('failed', False):
failed[fact_module] = res.get('msg')
failed[fact_module] = res
elif res.get('skipped', False):
skipped[fact_module] = res.get('msg')
skipped[fact_module] = res
else:
result = combine_vars(result, {'ansible_facts': res.get('ansible_facts', {})})

Expand All @@ -91,9 +91,9 @@ def run(self, tmp=None, task_vars=None):
res = self._execute_module(module_name='async_status', module_args=poll_args, task_vars=task_vars, wrap_async=False)
if res.get('finished', 0) == 1:
if res.get('failed', False):
failed[module] = res.get('msg')
failed[module] = res
elif res.get('skipped', False):
skipped[module] = res.get('msg')
skipped[module] = res
else:
result = combine_vars(result, {'ansible_facts': res.get('ansible_facts', {})})
del jobs[module]
Expand All @@ -105,16 +105,14 @@ def run(self, tmp=None, task_vars=None):

if skipped:
result['msg'] = "The following modules were skipped: %s\n" % (', '.join(skipped.keys()))
for skip in skipped:
result['msg'] += ' %s: %s\n' % (skip, skipped[skip])
result['skipped_modules'] = skipped
if len(skipped) == len(modules):
result['skipped'] = True

if failed:
result['failed'] = True
result['msg'] = "The following modules failed to execute: %s\n" % (', '.join(failed.keys()))
for fail in failed:
result['msg'] += ' %s: %s\n' % (fail, failed[fail])
result['failed_modules'] = failed

# tell executor facts were gathered
result['ansible_facts']['_ansible_facts_gathered'] = True
Expand Down