From 5a47953e7d52e6cbc0b173b393cb64f6e22f14bb Mon Sep 17 00:00:00 2001 From: Andy R Date: Wed, 7 Aug 2013 08:05:59 -0400 Subject: [PATCH] Never ask for SSH password when using local connection. With the command line option "-c local", ansible and ansible-playbook should never ask for a SSH password even if this is set in the config. Fixes #3720 --- bin/ansible | 3 +++ bin/ansible-playbook | 3 +++ 2 files changed, 6 insertions(+) diff --git a/bin/ansible b/bin/ansible index 7e1150a2591..20560f12584 100755 --- a/bin/ansible +++ b/bin/ansible @@ -97,6 +97,9 @@ class Cli(object): sshpass = None sudopass = None options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS + # Never ask for an SSH password when we run with local connection + if options.connection == "local": + options.ask_pass = False options.ask_sudo_pass= options.ask_sudo_pass or C.DEFAULT_ASK_SUDO_PASS ( sshpass, sudopass ) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass) if options.sudo_user or options.ask_sudo_pass: diff --git a/bin/ansible-playbook b/bin/ansible-playbook index 0f8f2b29ae7..59b6afa0785 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -91,6 +91,9 @@ def main(args): sudopass = None if not options.listhosts and not options.syntax and not options.listtasks: options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS + # Never ask for an SSH password when we run with local connection + if options.connection == "local": + options.ask_pass = False options.ask_sudo_pass = options.ask_sudo_pass or C.DEFAULT_ASK_SUDO_PASS ( sshpass, sudopass ) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass) options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER