Don't reuse variable names in playbooks

Also, ensure rejectattr condition works properly, and use boolean mode
for default filters so defaults work in the case of using deprecated
variables.

Author: Will Miller

tasks/destroy-vm.yml

@@ -3,21 +3,21 @@
 # exists before destroying it.
 - name: Check the VM's status
   virt:
-    name: "{{ libvirt_vm_name }}"
+    name: "{{ vm.name }}"
     command: list_vms
   register: result
   become: yes
 
 - block:
     - name: Ensure the VM is absent
       virt:
-        name: "{{ libvirt_vm_name }}"
+        name: "{{ vm.name }}"
         state: destroyed
       become: yes
 
     - name: Ensure the VM is undefined
       virt:
-        name: "{{ libvirt_vm_name }}"
+        name: "{{ vm.name }}"
         command: undefine
       become: yes
-  when: libvirt_vm_name in result.list_vms
+  when: vm.name in result.list_vms

tasks/destroy-volumes.yml

@@ -4,7 +4,7 @@
     destroy_virt_volume.sh
     {{ item.name }}
     {{ item.pool }}
-  with_items: "{{ libvirt_vm_volumes }}"
+  with_items: "{{ volumes }}"
   register: volume_result
   changed_when:
     - volume_result is success

tasks/main.yml

@@ -1,43 +1,40 @@
 ---
 - include_tasks: autodetect.yml
   # We need to know the engine and emulator if we're creating any new VMs.
-  when: "libvirt_vms | rejectattr('state', 'eq', 'absent')"
+  when: libvirt_vms | rejectattr('state', 'eq', 'absent') | list
 
 - include_tasks: volumes.yml
   vars:
-    libvirt_vm_volumes: "{{ vm.volumes | default([]) }}"
+    volumes: "{{ vm.volumes | default([], true) }}"
   with_items: "{{ libvirt_vms }}"
   loop_control:
     loop_var: vm
-  when: (vm.state | default('present')) == 'present'
+  when: (vm.state | default('present', true)) == 'present'
 
 - include_tasks: vm.yml
   vars:
-    libvirt_vm_console_log_path: "{{ vm.console_log_path | default(libvirt_vm_default_console_log_dir + '/' +  vm.name + 'console.log') }}"
-    libvirt_vm_name: "{{ vm.name }}"
+    console_log_path: "{{ vm.console_log_path | default(libvirt_vm_default_console_log_dir + '/' +  vm.name + 'console.log', true) }}"
     machine_default: "{{ none if libvirt_vm_engine == 'kvm' else 'pc-1.0' }}"
-    libvirt_vm_machine: "{{ vm.machine | default(machine_default) }}"
+    machine: "{{ vm.machine | default(machine_default, true) }}"
     cpu_mode_default: "{{ 'host-passthrough' if libvirt_vm_engine == 'kvm' else 'host-model' }}"
-    libvirt_vm_cpu_mode: "{{ vm.cpu_mode | default(cpu_mode_default) }}"
-    libvirt_vm_volumes: "{{ vm.volumes | default([]) }}"
-    libvirt_vm_interfaces: "{{ vm.interfaces | default([]) }}"
+    cpu_mode: "{{ vm.cpu_mode | default(cpu_mode_default, true) }}"
+    volumes: "{{ vm.volumes | default([], true) }}"
+    interfaces: "{{ vm.interfaces | default([], true) }}"
   with_items: "{{ libvirt_vms }}"
   loop_control:
     loop_var: vm
-  when: (vm.state | default('present')) == 'present'
+  when: (vm.state | default('present', true)) == 'present'
 
 - include_tasks: destroy-volumes.yml
   vars:
-    libvirt_vm_volumes: "{{ vm.volumes | default([]) }}"
+    volumes: "{{ vm.volumes | default([], true) }}"
   with_items: "{{ libvirt_vms }}"
   loop_control:
     loop_var: vm
-  when: (vm.state | default('present')) == 'absent'
+  when: (vm.state | default('present', true)) == 'absent'
 
 - include_tasks: destroy-vm.yml
-  vars:
-    libvirt_vm_name: "{{ vm.name }}"
   with_items: "{{ libvirt_vms }}"
   loop_control:
     loop_var: vm
-  when: (vm.state | default('present')) == 'absent'
+  when: (vm.state | default('present', true)) == 'absent'

tasks/vm.yml

@@ -1,7 +1,7 @@
 ---
 - name: Ensure the VM console log directory exists
   file:
-    path: "{{ libvirt_vm_console_log_path | dirname }}"
+    path: "{{ console_log_path | dirname }}"
     state: directory
     owner: qemu
     group: qemu
@@ -11,14 +11,14 @@
 
 - name: Ensure the VM is defined
   virt:
-    name: "{{ libvirt_vm_name }}"
+    name: "{{ vm.name }}"
     command: define
     xml: "{{ lookup('template', 'vm.xml.j2') }}"
   become: true
 
 - name: Ensure the VM is running and started at boot
   virt:
-    name: "{{ libvirt_vm_name }}"
+    name: "{{ vm.name }}"
     autostart: true
     state: running
   become: true

tasks/volumes.yml

@@ -3,14 +3,14 @@
   get_url:
     url: "{{ item }}"
     dest: "{{ libvirt_vm_image_cache_path }}/{{ item | basename }}"
-  with_items: "{{ libvirt_vm_volumes | selectattr('image', 'defined') | map(attribute='image') | list }}"
+  with_items: "{{ volumes | selectattr('image', 'defined') | map(attribute='image') | list }}"
   when: "'http' in item"
 
 - name: Ensure local images are copied
   copy:
     src: "{{ item }}"
     dest: "{{ libvirt_vm_image_cache_path }}/{{ item | basename }}"
-  with_items: "{{ libvirt_vm_volumes | selectattr('image', 'defined') | map(attribute='image') | list }}"
+  with_items: "{{ volumes | selectattr('image', 'defined') | map(attribute='image') | list }}"
   when: "'http' not in item"
 
 - name: Ensure the VM volumes exist
@@ -23,7 +23,7 @@
     {% if item.image is defined %}
     {{ libvirt_vm_image_cache_path }}/{{ item.image | basename }}
     {% endif %}
-  with_items: "{{ libvirt_vm_volumes }}"
+  with_items: "{{ volumes }}"
   register: volume_result
   changed_when:
     - volume_result is success

templates/vm.xml.j2

@@ -1,42 +1,42 @@
 <domain type='{{ libvirt_vm_engine }}'>
-  <name>{{ libvirt_vm_name }}</name>
-  <memory>{{ libvirt_vm_memory_mb | int * 1024 }}</memory>
-  <vcpu>{{ libvirt_vm_vcpus }}</vcpu>
+  <name>{{ vm.name }}</name>
+  <memory>{{ vm.memory_mb | int * 1024 }}</memory>
+  <vcpu>{{ vm.vcpus }}</vcpu>
   <clock sync="localtime"/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <os>
-    <type arch='{{ libvirt_vm_arch }}'{% if libvirt_vm_machine is not none %} machine='{{ libvirt_vm_machine }}'{% endif %}>hvm</type>
+    <type arch='{{ libvirt_vm_arch }}'{% if machine is not none %} machine='{{ machine }}'{% endif %}>hvm</type>
     <bootmenu enable='no'/>
     <boot dev='hd'/>
     <boot dev='network'/>
     <bios useserial='yes'/>
   </os>
-  <cpu{% if libvirt_vm_cpu_mode is not none %} mode='{{ libvirt_vm_cpu_mode }}'{% endif %}>
+  <cpu{% if cpu_mode is not none %} mode='{{ cpu_mode }}'{% endif %}>
     <model fallback='allow'/>
   </cpu>
   <devices>
     <emulator>{{ libvirt_vm_emulator }}</emulator>
-{% for volume in libvirt_vm_volumes %}
+{% for volume in volumes %}
     <disk type='volume' device='{{ volume.device | default('disk') }}'>
       <driver name='qemu' type='{{ volume.format }}'/>
       <source pool='{{ volume.pool }}' volume='{{ volume.name }}'/>
       <target dev='vd{{ 'abcdefghijklmnopqrstuvwxyz'[loop.index] }}'/>
     </disk>
 {% endfor %}
-{% for interface in libvirt_vm_interfaces %}
+{% for interface in interfaces %}
     <interface type='network'>
       <source network='{{ interface.network }}'/>
       <model type='virtio'/>
     </interface>
 {% endfor %}
      <serial type='file'>
-       <source path='{{ libvirt_vm_console_log_path }}'/>
+       <source path='{{ console_log_path }}'/>
      </serial>
      <serial type='pty'/>
      <console type='file'>
-       <source path='{{ libvirt_vm_console_log_path }}'/>
+       <source path='{{ console_log_path }}'/>
        <target type='serial'/>
      </console>
   </devices>