]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
set discovered_python_interpreter if ansible_python_interpreter is defined
authorJohannes Kastl <kastl@b1-systems.de>
Thu, 22 Aug 2019 15:46:05 +0000 (17:46 +0200)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Tue, 27 Aug 2019 21:06:43 +0000 (21:06 +0000)
If the user has set the `ansible_python_interpreter`, ansible will not try to
discover python, so `discovered_python_interpreter` will not be set.

Solution: Set `discovered_python_interpreter` to `ansible_python_interpreter`
if `ansible_python_interpreter` is defined

Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
(cherry picked from commit bd507fa14751398e1248a630fec2262b1540702b)

roles/ceph-facts/tasks/facts.yml

index 8658f775ce6a02a6efc74b191728d1ec5720b5d7..86f9a21efe9039808fa988c5fdcd8add5e45c939 100644 (file)
   set_fact:
     container_binary: "{{ 'podman' if (podman_binary.stat.exists and ansible_distribution == 'Fedora') or (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8') else 'docker' }}"
 
+# In case ansible_python_interpreter is set by the user,
+# ansible will not discover python and discovered_python_interpreter
+# will not be set
+- name: set_fact discovered_python_interpreter
+  set_fact:
+    discovered_python_interpreter: ansible_python_interpreter
+  when: ansible_python_interpreter is defined
+
 # Set ceph_release to ceph_stable by default
 - name: set_fact ceph_release ceph_stable_release
   set_fact: