From: Alex Schultz <aschultz@redhat.com>
Date: Thu, 11 Mar 2021 15:43:53 +0000 (-0700)
Subject: Disable facts by default in ansible.cfg
X-Git-Tag: v6.0.3~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=181924db7be003cc096f42dcbbd81af1cf787979;p=ceph-ansible.git

Disable facts by default in ansible.cfg

As a continuation of a7f2fa73e63e69dba2e41aaac9732397eec437c9, this
change switches fact injection to off by default in the provided
ansible.cfg.

Signed-off-by: Alex Schultz <aschultz@redhat.com>
(cherry picked from commit db031a4993480ca987011630fa716f7e2ccda976)
---

diff --git a/ansible.cfg b/ansible.cfg
index 2a844eddd..50fb0dd20 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -22,6 +22,7 @@ nocows = 1
 callback_whitelist = profile_tasks
 stdout_callback = yaml
 force_valid_group_names = ignore
+inject_facts_as_vars = False
 
 # Disable them in the context of https://review.openstack.org/#/c/469644
 retry_files_enabled = False
diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml
index c076acb60..110f3184d 100644
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -19,6 +19,16 @@
     discovered_interpreter_python: "{{ ansible_python_interpreter }}"
   when: ansible_python_interpreter is defined
 
+# If ansible_python_interpreter is not defined, this can result in the
+# discovered_interpreter_python fact from being set. This fails later in this
+# playbook and is used elsewhere.
+- name: set_fact discovered_interpreter_python if not previously set
+  set_fact:
+    discovered_interpreter_python: "{{ ansible_facts['discovered_interpreter_python'] }}"
+  when:
+    - discovered_interpreter_python is not defined
+    - ansible_facts['discovered_interpreter_python'] is defined
+
 # Set ceph_release to ceph_stable by default
 - name: set_fact ceph_release ceph_stable_release
   set_fact: