Extract volume defaults

Pull out volume defaults from templates into the defaults file, to ensure the role is kept DRY.
stackhpc · Aug 23, 2018 · 77e0ca4 · 77e0ca4
1 parent e91af31
commit 77e0ca4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -4,6 +4,12 @@
 # file path is not given.
 libvirt_vm_default_console_log_dir: "/var/log/libvirt-consoles/"
 
+# The default format for Libvirt volumes.
+libvirt_volume_default_format: qcow2
+
+# The default device for Libvirt volumes.
+libvirt_volume_default_device: disk
+
 # Path to cache downloaded images.
 libvirt_image_cache_path: "/tmp/"
 

diff --git a/tasks/volumes.yml b/tasks/volumes.yml
@@ -19,7 +19,7 @@
     {{ item.name }}
     {{ item.pool }}
     {{ item.capacity }}
-    {{ item.format | default('qcow2') }}
+    {{ item.format | default(libvirt_volume_default_format) }}
     {% if item.image is defined %}
     {{ libvirt_vm_image_cache_path }}/{{ item.image | basename }}
     {% endif %}

diff --git a/templates/vm.xml.j2 b/templates/vm.xml.j2
@@ -19,8 +19,8 @@
   <devices>
     <emulator>{{ libvirt_vm_emulator }}</emulator>
 {% for volume in volumes %}
-    <disk type='volume' device='{{ volume.device | default('disk') }}'>
-      <driver name='qemu' type='{{ volume.format }}'/>
+    <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] }}'/>
     </disk>