foo.sh/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix typo, rename disk vars and cleanup

Browse source
This commit is contained in:
Timo Makinen 2020-08-26 21:03:05 +03:00
parent 6798c71285
commit 18df5f418c
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
group_vars/git.yml
View file

@ -1,6 +1,6 @@
--- ---
datadisk_size: datadisks:
- 10 - 10
firewall_in: firewall_in:

2
group_vars/mirror.yml
View file

@ -1,6 +1,6 @@
--- ---
datadisk_size: datadisks:
- 1000 - 1000
firewall_in: firewall_in:

3
host_vars/ldap01.home.foo.sh.yml
View file

@ -1,7 +1,8 @@
--- ---
interfaces: [[20, "52:54:00:ac:dc:1f"]] interfaces: [[20, "52:54:00:ac:dc:1f"]]
vmhost: vmhost01.home.foo.sh vmhost: vmhost01.home.foo.sh
datadisk_size: [10] datadisks:
- 10
ldap_datadir: /export/ldap ldap_datadir: /export/ldap
ldap_master: true ldap_master: true

20
playbooks/include/vm-create.yml
View file

@ -12,20 +12,20 @@
os_disk_image: "/srv/libvirt/ssd/{{ inventory_hostname }}.a.img" os_disk_image: "/srv/libvirt/ssd/{{ inventory_hostname }}.a.img"
disk_opts: bus=virtio,cache=none,device=disk,format=raw disk_opts: bus=virtio,cache=none,device=disk,format=raw
extra_disks: >- virt_install_disks: >-
{% if datadisk_size is defined %} {% if datadisks is defined %}
{% for num in range(datadisk_size|count) %} {% for num in range(datadisks|count) %}
--disk /srv/libvirt/hdd/{{ inventory_hostname }}.{{ letters[num] }}.img,{{ disk_opts }},size={{ datadisk_size[num] }} --disk /srv/libvirt/hdd/{{ inventory_hostname }}.{{ letters[num] }}.img,{{ disk_opts }},size={{ datadisks[num] }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
virt_install_network: >- virt_install_network: >-
{% for item in interfaces %} {% for item in interfaces %}
{% if item[1] is defined %} {% if item[1] is defined %}
--network bridge=br{{ item[0] }},mac={{ item[1] }},model=virtio --network bridge=br{{ item[0] }},mac={{ item[1] }},model=virtio
{% else %} {% else %}
--network bridge=br{{ item[0] }},model=virtio --network bridge=br{{ item[0] }},model=virtio
{% endif %} {% endif %}
{% endfor %} {% endfor %}
tasks: tasks:
@ -67,8 +67,8 @@
--controller usb,model=none --sound none \ --controller usb,model=none --sound none \
--vcpus "sockets=1,cores={{ num_cpus }},threads=1,placement=auto" \ --vcpus "sockets=1,cores={{ num_cpus }},threads=1,placement=auto" \
--memory {{ mem_size }} --cpu host-passthrough \ --memory {{ mem_size }} --cpu host-passthrough \
--disk {{ os_disk_image }},{{ disk-opts }},size={{ dsk_size }} \ --disk {{ os_disk_image }},{{ disk_opts }},size={{ dsk_size }} \
{{ extra_disks }} --initrd-inject {{ tmpdir.path }}/include.ks \ {{ virt_install_disks }} --initrd-inject {{ tmpdir.path }}/include.ks \
{{ virt_install_network }} \ {{ virt_install_network }} \
{{ virt_install_os_args }} {{ virt_install_os_args }}
delegate_to: localhost delegate_to: localhost