From e2cf3b2d297ed4c6e9654841023fa78b2157ecfe Mon Sep 17 00:00:00 2001 From: espro Date: Thu, 20 Jun 2013 15:47:45 -0400 Subject: [PATCH 1/3] Update ansible.cfg Previous commit made config invalid. --- examples/ansible.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ansible.cfg b/examples/ansible.cfg index a889176fe3b..5777f52e480 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -66,7 +66,7 @@ module_name = command # format of string {{ ansible_managed }} available within Jinja2 # templates indicates to users editing templates files will be replaced. -, replacing {file}, {host} and {uid} and strftime codes with proper values. +# replacing {file}, {host} and {uid} and strftime codes with proper values. ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host} # if set, Ansible will raise errors when attempting to redeference Jinja2 From a00c7b0c088ee0e9552cbf54cbbbb4a4f14eb00a Mon Sep 17 00:00:00 2001 From: espro Date: Thu, 20 Jun 2013 16:14:15 -0400 Subject: [PATCH 2/3] Comment remote_user in ansible.cfg remote_user should not be set in example config. This file is used in rpm .spec for /etc/ansible/ansible.cfg --- examples/ansible.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ansible.cfg b/examples/ansible.cfg index 5777f52e480..73ddc825b5b 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -33,7 +33,7 @@ timeout = 10 # default user to use for playbooks if user is not specified # (/usr/bin/ansible will use current user as default) -remote_user=root +#remote_user=root # logging is off by default unless this path is defined # if so defined, consider logrotate From 3eeacaba8108406137c3647cec31ff28280c1898 Mon Sep 17 00:00:00 2001 From: espro Date: Thu, 20 Jun 2013 17:19:47 -0300 Subject: [PATCH 3/3] Updated ansible.cfg to be more consistent Updated the example ansible.cfg to be more consistent in spacing/commented lines --- examples/ansible.cfg | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/ansible.cfg b/examples/ansible.cfg index 73ddc825b5b..cd5af537226 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -23,46 +23,46 @@ transport = paramiko remote_port = 22 # change this for alternative sudo implementations -sudo_exe = sudo +sudo_exe = sudo # what flags to pass to sudo -# sudo_flags=-H +#sudo_flags = -H # SSH timeout -timeout = 10 +timeout = 10 # default user to use for playbooks if user is not specified # (/usr/bin/ansible will use current user as default) -#remote_user=root +#remote_user = root # logging is off by default unless this path is defined # if so defined, consider logrotate -# log_path = /var/log/ansible.log +#log_path = /var/log/ansible.log # default module name for /usr/bin/ansible -module_name = command +#module_name = command # use this shell for commands executed under sudo # you may need to change this to bin/bash in rare instances # if sudo is constrained -# executable = /bin/sh +#executable = /bin/sh # if inventory variables overlap, does the higher precedence one win # or are hash values merged together? The default is 'replace' but # this can also be set to 'merge'. -# hash_behaviour=replace +#hash_behaviour = replace # How to handle variable replacement - as of 1.2, Jinja2 variable syntax is # preferred, but we still support the old $variable replacement too. # Turn off ${old_style} variables here if you like. -# legacy_playbook_variables=yes +#legacy_playbook_variables = yes # list any Jinja2 extensions to enable here: -# jinja2_extensions=jinja2.ext.do,jinja2.ext.i18n +#jinja2_extensions = jinja2.ext.do,jinja2.ext.i18n # if set, always use this private key file for authentication, same as # if passing --private-key to ansible or ansible-playbook -#private_key_file=/path/to/file +#private_key_file = /path/to/file # format of string {{ ansible_managed }} available within Jinja2 # templates indicates to users editing templates files will be replaced. @@ -71,7 +71,7 @@ ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} # if set, Ansible will raise errors when attempting to redeference Jinja2 # variables that are not set in templates or action lines. -# error_on_undefined_vars = True +#error_on_undefined_vars = True # set plugin path directories here, seperate with colons action_plugins = /usr/share/ansible_plugins/action_plugins @@ -83,7 +83,7 @@ filter_plugins = /usr/share/ansible_plugins/filter_plugins # don't like cows? that's unfortunate. # set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1 -# nocows = 1 +#nocows = 1 [paramiko_connection] @@ -94,10 +94,10 @@ filter_plugins = /usr/share/ansible_plugins/filter_plugins # ssh arguments to use # Leaving off ControlPersist will result in poor performance, so use # paramiko on older platforms rather than removing it -ssh_args=-o ControlMaster=auto -o ControlPersist=60s -o ControlPath=/tmp/ansible-ssh-%h-%p-%r +ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o ControlPath=/tmp/ansible-ssh-%h-%p-%r # if True, make ansible use scp if the connection type is ssh # (default is sftp) -#scp_if_ssh=True +#scp_if_ssh = True