Merge pull request #21 from JPvRiel/master

Custom xml domain definition file and disk device start at vda

Author: markgoddard

README.md

@@ -27,7 +27,7 @@ Role Variables
 
 - `libvirt_vm_arch`: CPU architecture, default is `x86_64`.
 
-- `libvirt_vm_uri`: Override the libvirt connection URI. See the 
+- `libvirt_vm_uri`: Override the libvirt connection URI. See the
   [libvirt docs](https://libvirt.org/remote.html) docs for more details.
 
 - `libvirt_vm_virsh_default_env`: Variables contained within this dictionary are
@@ -100,6 +100,7 @@ Role Variables
     - `autostart`: Whether to start the VM when the host starts up. Default is
       `true`.
 
+    - `xml_template`: Optionally supply a modified XML template. Base customisation off the default `vm.xml.j2` template so as to include the expected jinja expressions the role uses.
 
 N.B. the following variables are deprecated: `libvirt_vm_state`,
 `libvirt_vm_name`, `libvirt_vm_memory_mb`, `libvirt_vm_vcpus`,

defaults/main.yml

@@ -61,10 +61,13 @@ libvirt_vms:
       # Path to console log file.
       console_log_path: "{{ libvirt_vm_console_log_path }}"
 
+      # XML template file to source domain definition
+      xml_file: vm.xml.j2
+      
 # Variables to add to the enviroment that is used to execute virsh commands
 libvirt_vm_virsh_default_env: "{{  { 'LIBVIRT_DEFAULT_URI': libvirt_vm_uri } if libvirt_vm_uri else {} }}"
 
-# Override for the libvirt connection uri. Leave unset to use the default. 
+# Override for the libvirt connection uri. Leave unset to use the default.
 libvirt_vm_uri: ""
 
 ### DEPRECATED ###

tasks/vm.yml

@@ -20,7 +20,7 @@
   virt:
     name: "{{ vm.name }}"
     command: define
-    xml: "{{ lookup('template', 'vm.xml.j2') }}"
+    xml: "{{ lookup('template', vm.xml_file | default('vm.xml.j2')) }}"
     uri: "{{ libvirt_vm_uri | default(omit, true) }}"
   become: true
 

templates/vm.xml.j2

@@ -22,7 +22,7 @@
     <disk type='volume' device='{{ volume.device | default(libvirt_volume_default_device) }}'>
       <driver name='qemu' type='{{ volume.format | default(libvirt_volume_default_format) }}'/>
       <source pool='{{ volume.pool }}' volume='{{ volume.name }}'/>
-      <target dev='vd{{ 'abcdefghijklmnopqrstuvwxyz'[loop.index] }}'/>
+      <target dev='vd{{ 'abcdefghijklmnopqrstuvwxyz'[loop.index - 1] }}'/>
     </disk>
 {% endfor %}
 {% for interface in interfaces %}