Commit 266e6894 by Michael DeHaan

Merge

parent 13f93de7
...@@ -10,15 +10,13 @@ hostfile = /etc/ansible/hosts ...@@ -10,15 +10,13 @@ hostfile = /etc/ansible/hosts
# location of ansible library, eliminates need to specify --module-path # location of ansible library, eliminates need to specify --module-path
<<<<<<< HEAD
library = /usr/share/ansible library = /usr/share/ansible
=======
# uncomment this to disable SSH key host checking # uncomment this to disable SSH key host checking
#host_checking = False #host_checking = False
# change this for alternative sudo implementations # change this for alternative sudo implementations
sudo_exe = sudo 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 # default module name used in /usr/bin/ansible when -m is not specified
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment