From 65fcb4035eda90acd1444b61b3c4403499dae1b5 Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Wed, 26 Aug 2020 21:22:22 +0300 Subject: [PATCH] Aggressive line shortening to get past yamllint --- playbooks/include/vm-create.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/playbooks/include/vm-create.yml b/playbooks/include/vm-create.yml index 5a9c9c8..e143a4e 100644 --- a/playbooks/include/vm-create.yml +++ b/playbooks/include/vm-create.yml @@ -7,15 +7,16 @@ vmhost_uri: "qemu+ssh://root@{{ vmhost }}/system" root_pubkey: "{{ lookup('file', '/srv/ansible-private/ssh/id_rsa.pub') }}" - letters: "{{ 'bcdefghijklmnopqrstuvwxyz'|list }}" + char: "{{ '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 + dsk_opts: bus=virtio,cache=none,device=disk,format=raw + base: /srv/libvirt/hdd/{{ inventory_hostname }} virt_install_disks: >- {% if datadisks is defined %} - {% for num in range(datadisks|count) %} - --disk /srv/libvirt/hdd/{{ inventory_hostname }}.{{ letters[num] }}.img,{{ disk_opts }},size={{ datadisks[num] }} + {% for i in range(datadisks|count) %} + --disk {{ base }}.{{ char[i] }}.img,{{ dsk_opts }},size={{ datadisks[i] }} {% endfor %} {% endif %} @@ -67,8 +68,9 @@ --controller usb,model=none --sound none \ --vcpus "sockets=1,cores={{ num_cpus }},threads=1,placement=auto" \ --memory {{ mem_size }} --cpu host-passthrough \ - --disk {{ os_disk_image }},{{ disk_opts }},size={{ dsk_size }} \ - {{ virt_install_disks }} --initrd-inject {{ tmpdir.path }}/include.ks \ + --disk {{ os_disk_image }},{{ dsk_opts }},size={{ dsk_size }} \ + --initrd-inject {{ tmpdir.path }}/include.ks \ + {{ virt_install_disks }} \ {{ virt_install_network }} \ {{ virt_install_os_args }} delegate_to: localhost