diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-01-01 17:13:26 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-01-02 23:26:17 +0100 |
| commit | a9c5560dcca18a0df93341289087a9585fbca29c (patch) | |
| tree | be284c40faea1e61f8304e49dcc7a9d0788be193 /roles/vm | |
| parent | minor cleanup for grafana dashboards (diff) | |
add new openwrt-based testvm
add new vm-deploy playbook and script
Diffstat (limited to 'roles/vm')
| -rw-r--r-- | roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 4 | ||||
| -rw-r--r-- | roles/vm/guest/install/tasks/main.yml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index 0430229b..11b1be6e 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -56,7 +56,7 @@ {% endif %} {% for bus in ['virtio', 'scsi'] %} {% for device, src in (install.disks[bus] | default({})).items() %} - <disk type='block' device='disk'> + <disk type='{{ (src.type == 'image') | ternary('file', 'block') }}' device='disk'> <driver name='qemu' type='raw' cache='none' discard='unmap'/> {% if src.type == 'lvm' %} <source dev='/dev/mapper/{{ src.vg | replace('-', '--') }}-{{ src.lv | replace('-', '--') }}'/> @@ -64,6 +64,8 @@ <source dev='/dev/zvol/{{ vm_host.zfs[src.backend | default('default')].pool }}/{{ vm_host.zfs[src.backend | default('default')].name }}/{{ inventory_hostname }}/{{ src.name }}'/> {% elif src.type == 'blockdev' %} <source dev='{{ src.path }}'/> +{% elif src.type == 'image' %} + <source file='{{ src.path }}'/> {% endif %} <target dev='{{ device }}' bus='{{ bus }}'/> </disk> diff --git a/roles/vm/guest/install/tasks/main.yml b/roles/vm/guest/install/tasks/main.yml index f2bd5362..d4a31929 100644 --- a/roles/vm/guest/install/tasks/main.yml +++ b/roles/vm/guest/install/tasks/main.yml @@ -10,7 +10,7 @@ size: "{{ item.value.size }}" state: present -- name: create zfs base datasets for vm +- name: create zfs-based datasets for vm loop: "{{ install.disks.virtio | default({}) | combine(install.disks.scsi | default({})) | dict2items | selectattr('value.type', 'eq', 'zfs') | map(attribute='value.backend') | map('default', 'default') | unique | list }}" delegate_to: "{{ vm_host.name }}" zfs: |