Things that happen inside multiprocessing shouldn't make side effects, ergo append ansible_facts only

in playbook code.

This technically means with_items calls can't continuously add facts I guess, but I can't see anyone
ever trying that.

Author: mpdehaan

lib/ansible/playbook/__init__.py

@@ -221,6 +221,11 @@ def _run_task(self, play, task, is_handler):
             results = {}
 
         self.stats.compute(results)
+
+        # add facts to the global setup cache
+        for host, result in results['contacted'].iteritems():
+            facts = result.get('ansible_facts', {})
+            self.SETUP_CACHE[host].update(facts)
 
         # flag which notify handlers need to be run
         if len(task.notify) > 0:

lib/ansible/runner/__init__.py

@@ -248,8 +248,6 @@ def _execute_normal_module(self, conn, tmp, module_name, inject=None):
             self.module_args += " #USE_SHELL"
 
         exec_rc = self._execute_module(conn, tmp, module_name, self.module_args, inject=inject)
-        if exec_rc.is_successful():
-            self.setup_cache[conn.host].update(exec_rc.result.get('ansible_facts', {}))
         return exec_rc
 
     # *****************************************************