changed setting values and updated docs

zz · Mar 19, 2014 · 18adf07 · 18adf07
1 parent 4dfa40f
commit 18adf07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/examples/ansible.cfg b/examples/ansible.cfg
@@ -24,9 +24,11 @@ transport      = smart
 remote_port    = 22
 module_lang    = C
 
-# controls implicit fact gathering (always, never or smart).
-# smart gathers only if not currently in memory.
-# does NOT affect explicit 'gather_facts' entries.
+# This setting controls implicit fact gathering, valid values are
+# implicit, explicit or smart (default).
+# smart gathers only if facts for that host are not currently in memory.
+# implicit set the default of gather_facts to True, explicit sets it
+# to False. This does NOT affect explicit 'gather_facts' entries.
 gathering = smart
 
 # additional paths to search for roles in, colon separated

diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py
@@ -485,7 +485,7 @@ def _do_setup_step(self, play):
             host_list = [h for h in host_list if h not in self.SETUP_CACHE or 'module_setup' not in self.SETUP_CACHE[h]]
             if len(host_list) == 0:
                 return {}
-        elif play.gather_facts is False or (play.gather_facts is None and C.DEFAULT_GATHERING == 'never'):
+        elif play.gather_facts is False or (play.gather_facts is None and C.DEFAULT_GATHERING == 'explicit'):
             return {}
 
         self.callbacks.on_setup()