Merge pull request #105 from skvidal/master

log a bit more and var_prompts

lib/ansible/callbacks.py

@@ -20,6 +20,7 @@
 
 import utils
 import sys
+import getpass
 
 #######################################################
 
@@ -176,6 +177,12 @@ class PlaybookCallbacks(object):
     def on_task_start(self, name, is_conditional):
         print utils.task_start_msg(name, is_conditional)
 
+    def on_vars_prompt(self, varname, private=True):
+        msg = 'input for %s: ' % varname
+        if private:
+            return getpass.getpass(msg)
+        return raw_input(msg)
+        
     def on_setup_primary(self):
         print "SETUP PHASE ****************************\n"
     

lib/ansible/playbook.py

@@ -95,6 +95,13 @@ class PlayBook(object):
         vars = play.get('vars', {})
         if type(vars) != dict:
             raise errors.AnsibleError("'vars' section must contain only key/value pairs")
+        vars_prompt = play.get('vars_prompt', {})
+        if type(vars_prompt) != dict:
+            raise errors.AnsibleError("'vars_prompt' section must contain only key/value pairs")
+        for vname in vars_prompt:
+            print vars_prompt[vname]
+            # FIXME - need some way to know that this prompt should be getpass or raw_input
+            vars[vname] =  self.callbacks.on_vars_prompt(vname)
         return vars
 
     # *****************************************************

lib/ansible/runner.py

@@ -357,6 +357,12 @@ class Runner(object):
             cmd = "%s %s" % (remote_module_path, argsfile)
         else:
             cmd = " ".join([str(x) for x in [remote_module_path, async_jid, async_limit, async_module, argsfile]])
+
+        # log command as the full command not as the path to args file - helps with debugging
+        msg = '%s: "%s"' % (self.module_name, args)
+        conn.exec_command('/usr/bin/logger -t ansible -p auth.info "%s"' % msg, None)
+
+                    
         res, err = self._exec_command(conn, cmd, tmp, sudoable=True)
         return ( res, err, client_executed_str )