Merge branch 'playbook_ssh_ask_pass' of git://github.com/clatour/ansible into devel

Conflicts:
	examples/ansible.cfg

+ doc tweak
This commit is contained in:
Michael DeHaan 2012-11-03 19:23:38 -04:00
commit 6f938c9f4c
5 changed files with 12 additions and 5 deletions

View file

@ -46,12 +46,16 @@ poll_interval=15
sudo_user=root
# to force ansible to always ask for the sudo password (instead of having
# to add -K to the commandline). Or you can use the environment
# variable (ANSIBLE_ASK_SUDO_PASS)
# the following forces ansible to always ask for the sudo password (instead of having
# to add -K to the commandline). Or you can use the environment variable (ANSIBLE_ASK_SUDO_PASS)
#ask_sudo_pass=True
# the following forces ansible to always ask for the ssh-password (-k)
# can also be set by the environment variable ANSIBLE_ASK_PASS
#ask_pass=True
# connection to use when -c <connection_type> is not specified
transport=paramiko