From a333f2e5b02efa2033ba2ee22e5d5654bf1722b4 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Wed, 4 Oct 2017 11:36:53 -0700
Subject: [PATCH] Fix ansible-test config management.

---
 test/integration/integration.cfg         |  0
 test/integration/windows-integration.cfg |  0
 test/runner/lib/ansible_util.py          | 22 +++++++++++++++++-----
 test/sanity/ansible.cfg                  |  0
 test/units/ansible.cfg                   |  0
 5 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 test/integration/integration.cfg
 create mode 100644 test/integration/windows-integration.cfg
 create mode 100644 test/sanity/ansible.cfg
 create mode 100644 test/units/ansible.cfg

diff --git a/test/integration/integration.cfg b/test/integration/integration.cfg
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/integration/windows-integration.cfg b/test/integration/windows-integration.cfg
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/runner/lib/ansible_util.py b/test/runner/lib/ansible_util.py
index c90772c8b31..381b57278f6 100644
--- a/test/runner/lib/ansible_util.py
+++ b/test/runner/lib/ansible_util.py
@@ -4,7 +4,14 @@ from __future__ import absolute_import, print_function
 
 import os
 
-from lib.util import common_environment
+from lib.util import (
+    common_environment,
+    ApplicationError,
+)
+
+from lib.config import (
+    IntegrationConfig,
+)
 
 
 def ansible_environment(args, color=True):
@@ -21,19 +28,24 @@ def ansible_environment(args, color=True):
     if not path.startswith(ansible_path + os.pathsep):
         path = ansible_path + os.pathsep + path
 
+    if isinstance(args, IntegrationConfig):
+        ansible_config = 'test/integration/%s.cfg' % args.command
+    else:
+        ansible_config = 'test/%s/ansible.cfg' % args.command
+
+    if not os.path.exists(ansible_config):
+        raise ApplicationError('Configuration not found: %s' % ansible_config)
+
     ansible = dict(
         ANSIBLE_FORCE_COLOR='%s' % 'true' if args.color and color else 'false',
         ANSIBLE_DEPRECATION_WARNINGS='false',
         ANSIBLE_HOST_KEY_CHECKING='false',
+        ANSIBLE_CONFIG=os.path.abspath(ansible_config),
         PYTHONPATH=os.path.abspath('lib'),
         PAGER='/bin/cat',
         PATH=path,
     )
 
-    if os.path.isfile('test/integration/%s.cfg' % args.command):
-        ansible_config = os.path.abspath('test/integration/%s.cfg' % args.command)
-        ansible['ANSIBLE_CONFIG'] = ansible_config
-
     env.update(ansible)
 
     if args.debug:
diff --git a/test/sanity/ansible.cfg b/test/sanity/ansible.cfg
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/units/ansible.cfg b/test/units/ansible.cfg
new file mode 100644
index 00000000000..e69de29bb2d