summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Bielawa <timbielawa@gmail.com>2017-02-01 11:17:29 -0800
committerGitHub <noreply@github.com>2017-02-01 11:17:28 -0800
commit4431d38b412470f3e20564333afea7cf99ecb298 (patch)
tree60aa1db2ca46ac1f2a96f03fa73b18909433c4de
parent27b41eeff4957d4961b758c64c76aeb085069563 (diff)
parentb804e70cdd0bc8601bfc87fcf3e34043223828ee (diff)
downloadopenshift-4431d38b412470f3e20564333afea7cf99ecb298.tar.gz
openshift-4431d38b412470f3e20564333afea7cf99ecb298.tar.bz2
openshift-4431d38b412470f3e20564333afea7cf99ecb298.tar.xz
openshift-4431d38b412470f3e20564333afea7cf99ecb298.zip
Merge pull request #3241 from mtnbikenc/ansible-cfg
Add default ansible.cfg file
-rw-r--r--.gitignore1
-rw-r--r--ansible.cfg (renamed from ansible.cfg.example)19
2 files changed, 13 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index d3fab9f1a..1e187db16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ gce.ini
multi_ec2.yaml
.vagrant
.tags*
-/ansible.cfg
*.retry
.vscode/*
.cache
diff --git a/ansible.cfg.example b/ansible.cfg
index 6a7722ad8..034733684 100644
--- a/ansible.cfg.example
+++ b/ansible.cfg
@@ -3,15 +3,18 @@
# This config file provides examples for running
# the OpenShift playbooks with the provided
-# inventory scripts. Only global defaults are
-# left uncommented
+# inventory scripts.
[defaults]
-# Add the roles directory to the roles path
-roles_path = roles/
-
# Set the log_path
-log_path = /tmp/ansible.log
+#log_path = /tmp/ansible.log
+
+# Additional default options for OpenShift Ansible
+callback_plugins = callback_plugins/
+forks = 20
+host_key_checking = False
+retry_files_enabled = False
+nocows = True
# Uncomment to use the provided BYO inventory
#hostfile = inventory/byo/hosts
@@ -21,3 +24,7 @@ log_path = /tmp/ansible.log
# Uncomment to use the provided AWS dynamic inventory script
#hostfile = inventory/aws/ec2.py
+
+# Additional ssh options for OpenShift Ansible
+[ssh_connection]
+pipelining = True