Skip to content

Commit 59c13b7

Browse files
committed
Update to use standard libvirt pools
1 parent 617e07b commit 59c13b7

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

templates/vm.xml.j2

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@
3535
<driver name='qemu' type='{{ volume.format | default(libvirt_volume_default_format) }}'/>
3636
{% if volume.type | default(libvirt_volume_default_type) == 'file' %}
3737
<source file='{{ volume.file_path |default(libvirt_volume_default_images_path) }}/{{ volume.name}}'/>
38-
{% elif volume.zfs_pool is defined and volume.zfs_pool is sameas true %}
39-
<source dev='/dev/zvol/{{ ansible_local.libvirt.zfs_storage_pools[volume.pool] }}/{{ volume.name }}'/>
4038
{% else %}
4139
<source pool='{{ volume.pool }}' volume='{{ volume.name }}'/>
4240
{% endif %}
4341
{% if volume.target is undefined %}
44-
<target dev='vd{{ 'abcdefghijklmnopqrstuvwxyz'[loop.index - 1] }}' {% if volume.device | default(libvirt_volume_default_device) == 'cdrom' %}bus='sata'{% endif %}/>
42+
<target dev='vd{{ 'abcdefghijklmnopqrstuvwxyz'[loop.index - 1] }}' {% if volume.device | default(libvirt_volume_default_device) == 'cdrom' %}bus='sata'{% else %}bus='virtio'{% endif %}/>
4543
{% else %}
4644
<target dev='{{ volume.target }}' {% if volume.device | default(libvirt_volume_default_device) == 'cdrom' %}bus='sata'{% endif %}/>
4745
{% endif %}

vars/Archlinux.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
---
2-
32
# Who owns the serial console logs in console_log_path
43
libvirt_vm_log_owner: root
54

65
# The environment passed to virt_volume.sh
7-
libvirt_vm_script_env_arch: []
8-
# VOLUME_GROUP: qemu
9-
# VOLUME_OWNER: qemu
6+
libvirt_vm_script_env_arch: {}
107

118
libvirt_vm_script_env: >-
129
{{ libvirt_vm_script_env_arch | combine(libvirt_vm_virsh_default_env) }}

0 commit comments

Comments
 (0)