Merge pull request #79 from stackhpc/ansible-facts

Use ansible_facts to reference facts

Author: markgoddard

tasks/autodetect.yml

@@ -15,7 +15,7 @@
     - name: Set a fact containing the virtualisation engine
       set_fact:
         libvirt_vm_engine: >-
-          {%- if ansible_architecture != libvirt_vm_arch -%}
+          {%- if ansible_facts.architecture != libvirt_vm_arch -%}
           {# Virtualisation instructions are generally available only for the host
           architecture. Ideally we would test for virtualisation instructions, eg. vt-d
           as it is possible that another architecture could support these even
@@ -59,8 +59,8 @@
           when: kvm_emulator_result.stat.exists
       when:
         - libvirt_vm_engine == 'qemu'
-        - ansible_os_family == 'RedHat'
-        - ansible_distribution_major_version | int >= 8
+        - ansible_facts.os_family == 'RedHat'
+        - ansible_facts.distribution_major_version | int >= 8
 
     - block:
         - name: Detect the QEMU emulator binary path
@@ -74,7 +74,7 @@
 
       when:
         - libvirt_vm_engine == 'qemu'
-        - ansible_os_family != 'RedHat' or ansible_distribution_major_version | int == 7
+        - ansible_facts.os_family != 'RedHat' or ansible_facts.distribution_major_version | int == 7
 
     - name: Fail if unable to detect the emulator
       fail:

tasks/main.yml

@@ -3,9 +3,9 @@
   include_vars: "{{ item }}"
   with_first_found:
     - files:
-        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
-        - "{{ ansible_distribution }}.yml"
-        - "{{ ansible_os_family }}.yml"
+        - "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml"
+        - "{{ ansible_facts.distribution }}.yml"
+        - "{{ ansible_facts.os_family }}.yml"
   tags: vars
 
 - include_tasks: autodetect.yml
@@ -18,8 +18,8 @@
 # Libvirt requires qemu-img to create qcow2 files.
 - name: Ensure qemu-img is installed
   package:
-    name: "{{ 'qemu-img' if ansible_os_family == 'RedHat' else 'qemu-utils' }}"
-    update_cache: "{{ True if ansible_pkg_mgr == 'apt' else omit }}"
+    name: "{{ 'qemu-img' if ansible_facts.os_family == 'RedHat' else 'qemu-utils' }}"
+    update_cache: "{{ True if ansible_facts.pkg_mgr == 'apt' else omit }}"
   become: true
 
 - include_tasks: volumes.yml