diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-12-28 00:08:41 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-12-29 01:20:13 +0100 |
| commit | 90d7d57cf85d93f3662fc54bd5848b0fe4fb44f2 (patch) | |
| tree | 2b3434f289e2a4ed5d414118c6838c16717896ec /roles/vm | |
| parent | atlas now uses zfs for vm disks (diff) | |
vm/guest: switch to machine-type q35
Diffstat (limited to 'roles/vm')
| -rw-r--r-- | roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 6 | ||||
| -rw-r--r-- | roles/vm/guest/install/tasks/installer-debian.yml | 2 | ||||
| -rw-r--r-- | roles/vm/guest/network/templates/systemd.link.j2 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index d329a7de..37d84d8e 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -4,7 +4,7 @@ <currentMemory>{{ ((install_cooked.vm.memory | human_to_bytes) / 1024) | int }}</currentMemory> <vcpu>{{ install_cooked.vm.numcpus }}</vcpu> <os> - <type arch='x86_64' machine='pc'>hvm</type> + <type arch='x86_64' machine='q35'>hvm</type> {% if vm_define_installer %} {% if install_distro == 'debian' or install_distro == 'ubuntu' %} <kernel>{{ installer_tmpdir }}/linux</kernel> @@ -45,7 +45,7 @@ <disk type='file' device='cdrom'> <driver name='qemu'/> <source file='{{ installer_tmpdir }}/{{ inventory_hostname }}.iso'/> - <target dev='hdc' bus='ide'/> + <target dev='sdz' bus='sata'/> <readonly/> </disk> @@ -91,7 +91,7 @@ {% endif %} <source bridge='{{ if.bridge }}'/> <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x01' slot='0x0{{ loop.index }}' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x{{ "%02x" | format(loop.index0 + 16) }}' slot='0x00' function='0x0'/> </interface> {% endfor %} {% endif %} diff --git a/roles/vm/guest/install/tasks/installer-debian.yml b/roles/vm/guest/install/tasks/installer-debian.yml index ab7342da..80d41647 100644 --- a/roles/vm/guest/install/tasks/installer-debian.yml +++ b/roles/vm/guest/install/tasks/installer-debian.yml @@ -26,6 +26,6 @@ debian_preseed_virtual_machine: yes debian_preseed_force_net_ifnames_policy: path debian_preseed_no_netplan: yes - install_interface: enp1s1 + install_interface: enp16s0 import_role: name: installer/debian/preseed diff --git a/roles/vm/guest/network/templates/systemd.link.j2 b/roles/vm/guest/network/templates/systemd.link.j2 index 7093e164..629275ad 100644 --- a/roles/vm/guest/network/templates/systemd.link.j2 +++ b/roles/vm/guest/network/templates/systemd.link.j2 @@ -1,5 +1,5 @@ [Match] -Path=*pci-0000:01:{{ "%02d" | format(interface_index + 1) }}.0 +Path=*pci-0000:{{ "%02x" | format(interface_index + 16) }}:00.0 [Link] Name={{ item.name }} |