diff options
| author | Michael DeHaan <michael@ansibleworks.com> | 2013-07-04 21:30:20 -0400 |
|---|---|---|
| committer | Michael DeHaan <michael@ansibleworks.com> | 2013-07-04 21:30:20 -0400 |
| commit | 266e6894039a198e8e8a273cf21e51511c014a51 (patch) | |
| tree | 1ea43b8cb20bd8d6c58a87e7032facfc70e2d475 | |
| parent | 13f93de78a44b05acc626a97d063a62ea9bba87d (diff) | |
| download | ansible-266e6894039a198e8e8a273cf21e51511c014a51.tar.gz | |
Merge
| -rw-r--r-- | examples/ansible.cfg | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/examples/ansible.cfg b/examples/ansible.cfg index 712c70682a..27b302e701 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -10,15 +10,13 @@ hostfile = /etc/ansible/hosts # location of ansible library, eliminates need to specify --module-path -<<<<<<< HEAD library = /usr/share/ansible -======= + # uncomment this to disable SSH key host checking #host_checking = False # change this for alternative sudo implementations sudo_exe = sudo ->>>>>>> 9db4f7a... Makes host key checking the default behavior but can be disabled in ansible.cfg or by environment variable. # default module name used in /usr/bin/ansible when -m is not specified |