From 88eacbed7a7332276fbb2c725a9aaf9c4a713b93 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 1 Mar 2019 14:24:18 -0500
Subject: [PATCH] Add ansible.cfg to inventory folder

We should provide a default ansible.cfg file that users can either use
or modify.

Change-Id: Id6258e7a5250428de85693184e51df41094f170c
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 inventory/testing/ansible.cfg | 12 ++++++++++++
 tests/ansible.cfg             |  9 ---------
 tests/playbooks/pre.yaml      | 10 +++++-----
 3 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 inventory/testing/ansible.cfg
 delete mode 100644 tests/ansible.cfg

diff --git a/inventory/testing/ansible.cfg b/inventory/testing/ansible.cfg
new file mode 100644
index 0000000..92d6c3b
--- /dev/null
+++ b/inventory/testing/ansible.cfg
@@ -0,0 +1,12 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#
+[defaults]
+callback_whitelist = profile_tasks, timer
+fact_caching_connection = ~/.cache/ansible/facts
+fact_caching = jsonfile
+retry_files_enabled = false
+
+[ssh_connection]
+pipelining = true
+retries = 3
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
deleted file mode 100644
index 6b40916..0000000
--- a/tests/ansible.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-[defaults]
-callback_whitelist = profile_tasks, timer
-fact_caching = jsonfile
-fact_caching_connection = ~/.cache/ansible/facts
-
-[ssh_connection]
-# NOTE(pabelanger): Enable pipelining to deal with becomes issues:
-# http://docs.ansible.com/ansible/become.html#becoming-an-unprivileged-user
-pipelining = True
diff --git a/tests/playbooks/pre.yaml b/tests/playbooks/pre.yaml
index bd9d846..af896c3 100644
--- a/tests/playbooks/pre.yaml
+++ b/tests/playbooks/pre.yaml
@@ -16,11 +16,11 @@
         state: absent
       when: ansible_os_family == 'RedHat'
 
-    - name: Install ansible configuration file
-      copy:
-        dest: "{{ ansible_user_dir }}/.ansible.cfg"
-        remote_src: true
-        src: "{{ ansible_user_dir }}/{{ windmill_src_dir }}/tests/ansible.cfg"
+    - name: Symlink ansible configuration file
+      file:
+        dest: ~/.ansible.cfg
+        src: "{{ ansible_user_dir}}/{{ windmill_src_dir }}/inventory/testing/ansible.cfg"
+        state: link
 
     - name: Bootstrap bindep environment
       args: