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)
(cherry picked from commit 5fa4ff5ed36e9df3215e54cb55ddc6e9905f486c)

diff --git a/ansible.cfg b/ansible.cfg
index c579a576b41be9af1ae186d26b005f59e0db06f3..ba8d50e678af9610ad1d95299d328b3c82e9b331 100644 (file)
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -21,6 +21,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 370a6e09c28103578af46abd2fec0ad2b769a461..364dd10b1252ccd49aee5fcabf731bdbc4da4e7d 100644 (file)
--- 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: