From 8be2fc745b2a80291c0d6741f60becff168aed22 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 8 Aug 2013 20:32:30 -0500 Subject: [PATCH] Revert "Check for ansible_facts in results for with_ tasks" This reverts commit 1a4e6e415ef9fa156aecbd7682d309858542c69b. --- lib/ansible/playbook/__init__.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py index b324454e508..716ac597b1f 100644 --- a/lib/ansible/playbook/__init__.py +++ b/lib/ansible/playbook/__init__.py @@ -361,15 +361,8 @@ class PlayBook(object): # add facts to the global setup cache for host, result in contacted.iteritems(): - if 'results' in result: - # task ran with_ lookup plugin, so facts are encapsulated in - # multiple list items in the results key - for res in result['results']: - facts = res.get('ansible_facts', {}) - self.SETUP_CACHE[host].update(facts) - else: - facts = result.get('ansible_facts', {}) - self.SETUP_CACHE[host].update(facts) + facts = result.get('ansible_facts', {}) + self.SETUP_CACHE[host].update(facts) # extra vars need to always trump - so update again following the facts self.SETUP_CACHE[host].update(self.extra_vars) if task.register: