From 6798c71285cbdee36cf5568a3066a63a6fe631a9 Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Wed, 26 Aug 2020 20:28:15 +0300 Subject: [PATCH] Make vars more readable and fix one lint error --- playbooks/include/vm-create.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/playbooks/include/vm-create.yml b/playbooks/include/vm-create.yml index eb43262..47daee2 100644 --- a/playbooks/include/vm-create.yml +++ b/playbooks/include/vm-create.yml @@ -4,16 +4,21 @@ gather_facts: false vars: - letters: "{{ 'bcdefghijklmnopqrstuvwxyz'|list }}" - console_log: "/var/log/libvirt/qemu/{{ inventory_hostname }}.console.log" vmhost_uri: "qemu+ssh://root@{{ vmhost }}/system" root_pubkey: "{{ lookup('file', '/srv/ansible-private/ssh/id_rsa.pub') }}" + + letters: "{{ 'bcdefghijklmnopqrstuvwxyz'|list }}" + console_log: "/var/log/libvirt/qemu/{{ inventory_hostname }}.console.log" + os_disk_image: "/srv/libvirt/ssd/{{ inventory_hostname }}.a.img" + disk_opts: bus=virtio,cache=none,device=disk,format=raw + extra_disks: >- {% if datadisk_size is defined %} {% for num in range(datadisk_size|count) %} - --disk /srv/libvirt/hdd/{{ inventory_hostname }}.{{ letters[num] }}.img,cache=none,format=raw,bus=virtio,size={{ datadisk_size[num] }} + --disk /srv/libvirt/hdd/{{ inventory_hostname }}.{{ letters[num] }}.img,{{ disk_opts }},size={{ datadisk_size[num] }} {% endfor %} {% endif %} + virt_install_network: >- {% for item in interfaces %} {% if item[1] is defined %} @@ -62,7 +67,7 @@ --controller usb,model=none --sound none \ --vcpus "sockets=1,cores={{ num_cpus }},threads=1,placement=auto" \ --memory {{ mem_size }} --cpu host-passthrough \ - --disk /srv/libvirt/ssd/{{ inventory_hostname }}.a.img,cache=none,format=raw,bus=virtio,size={{ dsk_size }} \ + --disk {{ os_disk_image }},{{ disk-opts }},size={{ dsk_size }} \ {{ extra_disks }} --initrd-inject {{ tmpdir.path }}/include.ks \ {{ virt_install_network }} \ {{ virt_install_os_args }}