From 694ac8ce46aa21559e8e8f6800789d88fadb8844 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 18 Jul 2018 13:39:07 +0200
Subject: [PATCH] Use global ansible.cfg for nodes-uuid playbook

Previously we tried setting from within the Ceph service some Ansible
settings before launching the nodes-uuid playbook; we should instead
just point to the global ansible.cfg file.

Also includes setting environment variables not in the ansible.cfg.

Co-Authored-By: John Fulton <fulton@redhat.com>
Closes-Bug: #1782423
Change-Id: Id220ebba5d9881eae943c7459b2328d3384b7370
---
 docker/services/ceph-ansible/ceph-base.yaml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index 891d3724c2..d02f1c6333 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -420,9 +420,8 @@ outputs:
                 list_join:
                 - ' '
                 - - ANSIBLE_LOG_PATH="{{playbook_dir}}/ceph-ansible/nodes_uuid_command.log"
-                  - ANSIBLE_SSH_RETRIES=3
-                  - ANSIBLE_HOST_KEY_CHECKING=False
-                  - DEFAULT_FORKS=25
+                  - ANSIBLE_CONFIG="{{playbook_dir}}/ansible.cfg"
+                  - ANSIBLE_REMOTE_TEMP=/tmp/nodes_uuid_tmp
                   - ansible-playbook
                   - '{% if ansible_ssh_private_key_file is defined %}--private-key {{ansible_ssh_private_key_file}}{% endif %}'
                   - '-i'
@@ -437,14 +436,13 @@ outputs:
                   list_join:
                   - ' '
                   - - ANSIBLE_ACTION_PLUGINS=/usr/share/ceph-ansible/plugins/actions/
+                    - ANSIBLE_CALLBACK_PLUGINS=/usr/share/ceph-ansible/plugins/callback/
                     - ANSIBLE_ROLES_PATH=/usr/share/ceph-ansible/roles/
                     - ANSIBLE_LOG_PATH="{{playbook_dir}}/ceph-ansible/ceph_ansible_command.log"
                     - ANSIBLE_LIBRARY=/usr/share/ceph-ansible/library/
-                    - ANSIBLE_RETRY_FILES_ENABLED=False
-                    - ANSIBLE_SSH_RETRIES=3
-                    - ANSIBLE_HOST_KEY_CHECKING=False
-                    - DEFAULT_FORKS=25
                     - ANSIBLE_CONFIG=/usr/share/ceph-ansible/ansible.cfg
+                    - ANSIBLE_REMOTE_TEMP=/tmp/ceph_ansible_tmp
+                    - ANSIBLE_FORKS=25
                     - yaql:
                         data: {get_param: CephAnsibleEnvironmentVariables}
                         expression: $.data.items().select($[0] + '=' + $[1]).join(' ')