From b804e70cdd0bc8601bfc87fcf3e34043223828ee Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Wed, 1 Feb 2017 10:28:05 -0500 Subject: Add default ansible.cfg file By default the callback_plugins need to be run to ensure proper Ansible version --- .gitignore | 1 - ansible.cfg | 30 ++++++++++++++++++++++++++++++ ansible.cfg.example | 23 ----------------------- 3 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 ansible.cfg delete mode 100644 ansible.cfg.example 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 b/ansible.cfg new file mode 100644 index 000000000..034733684 --- /dev/null +++ b/ansible.cfg @@ -0,0 +1,30 @@ +# config file for ansible -- http://ansible.com/ +# ============================================== + +# This config file provides examples for running +# the OpenShift playbooks with the provided +# inventory scripts. + +[defaults] +# Set the log_path +#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 + +# Uncomment to use the provided GCE dynamic inventory script +#hostfile = inventory/gce/gce.py + +# Uncomment to use the provided AWS dynamic inventory script +#hostfile = inventory/aws/ec2.py + +# Additional ssh options for OpenShift Ansible +[ssh_connection] +pipelining = True diff --git a/ansible.cfg.example b/ansible.cfg.example deleted file mode 100644 index 6a7722ad8..000000000 --- a/ansible.cfg.example +++ /dev/null @@ -1,23 +0,0 @@ -# config file for ansible -- http://ansible.com/ -# ============================================== - -# This config file provides examples for running -# the OpenShift playbooks with the provided -# inventory scripts. Only global defaults are -# left uncommented - -[defaults] -# Add the roles directory to the roles path -roles_path = roles/ - -# Set the log_path -log_path = /tmp/ansible.log - -# Uncomment to use the provided BYO inventory -#hostfile = inventory/byo/hosts - -# Uncomment to use the provided GCE dynamic inventory script -#hostfile = inventory/gce/gce.py - -# Uncomment to use the provided AWS dynamic inventory script -#hostfile = inventory/aws/ec2.py -- cgit v1.2.3