cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1021 from lorin/config-key

Browse source 
Have ansible respect private_key_file option
This commit is contained in:
Michael DeHaan 2012-09-08 05:21:02 -07:00
commit 925c9eb38f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/ansible.cfg
View file

@ -21,7 +21,7 @@ module_name = command
remote_tmp = $HOME/.ansible/tmp
# the default pattern for ansible-playbooks ("hosts:")
# the default pattern for ansible-playbooks ("hosts:")
pattern = *
@ -62,7 +62,7 @@ remote_port=22
#remote_user=root
# if set, always use this private key file for authentication, same as if passing
# --private-key-file to ansible or ansible-playbook
# --private-key to ansible or ansible-playbook
#private_key_file=/path/to/file

2
lib/ansible/utils.py
View file

@ -394,7 +394,7 @@ def base_parser(constants=C, usage="", output_opts=False, runas_opts=False,
default=constants.DEFAULT_HOST_LIST)
parser.add_option('-k', '--ask-pass', default=False, dest='ask_pass', action='store_true',
help='ask for SSH password')
parser.add_option('--private-key', default=None, dest='private_key_file',
parser.add_option('--private-key', default=C.DEFAULT_PRIVATE_KEY_FILE, dest='private_key_file',
help='use this file to authenticate the connection')
parser.add_option('-K', '--ask-sudo-pass', default=False, dest='ask_sudo_pass', action='store_true',
help='ask for sudo password')