From cf8c443ffb2c5afaa2257d1834c391204c100759 Mon Sep 17 00:00:00 2001
From: John Fulton <fulton@redhat.com>
Date: Fri, 27 Apr 2018 12:27:47 -0400
Subject: [PATCH] Execute ceph-ansible with its own ansible.cfg

Modify the ceph-ansible execution so that it uses the ansible.cfg
that is shipped with ceph-ansible. ceph-ansible's own testing uses
this file and the project's maintainers recommend it be used.

This configuration file also uses ControlMaster=auto which is not
used by config download at this time. Adding this setting to the
ceph-ansible execution should make it take less time.

Change-Id: I774132eb8b7a43c921c0696635d56b4136301346
Closes-Bug: 1767252
---
 docker/services/ceph-ansible/ceph-base.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index e49574c205..94a6676b4b 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -410,6 +410,7 @@ outputs:
                     - ANSIBLE_SSH_RETRIES=3
                     - ANSIBLE_HOST_KEY_CHECKING=False
                     - DEFAULT_FORKS=25
+                    - ANSIBLE_CONFIG=/usr/share/ceph-ansible/ansible.cfg
                     - yaql:
                         data: {get_param: CephAnsibleEnvironmentVariables}
                         expression: $.data.items().select($[0] + '=' + $[1]).join(' ')