diff options
Diffstat (limited to 'roles/vm/guest/define')
| -rw-r--r-- | roles/vm/guest/define/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/vm/guest/define/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 18 |
3 files changed, 15 insertions, 15 deletions
diff --git a/roles/vm/guest/define/defaults/main.yml b/roles/vm/guest/define/defaults/main.yml index 05aeaab6..f0c74831 100644 --- a/roles/vm/guest/define/defaults/main.yml +++ b/roles/vm/guest/define/defaults/main.yml @@ -1,5 +1,5 @@ --- -vm_define_autostart: "{{ not vm_define_installer and install_cooked.vm.autostart | default(False) }}" +vm_define_autostart: "{{ not vm_define_installer and install.vm.autostart | default(False) }}" vm_define_start: yes vm_define_installer: no diff --git a/roles/vm/guest/define/tasks/main.yml b/roles/vm/guest/define/tasks/main.yml index a4405de1..769afdac 100644 --- a/roles/vm/guest/define/tasks/main.yml +++ b/roles/vm/guest/define/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: check if vm already exists - delegate_to: "{{ vm_host_cooked.name }}" + delegate_to: "{{ vm_host.name }}" virt: name: "{{ inventory_hostname }}" command: info @@ -8,7 +8,7 @@ - name: remove old vm when: inventory_hostname in vmhost_info - delegate_to: "{{ vm_host_cooked.name }}" + delegate_to: "{{ vm_host.name }}" block: - name: destroy exisiting vm virt: @@ -27,14 +27,14 @@ command: undefine - name: define vm - delegate_to: "{{ vm_host_cooked.name }}" + delegate_to: "{{ vm_host.name }}" virt: command: define xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}" - name: start new vm when: vm_define_start | bool - delegate_to: "{{ vm_host_cooked.name }}" + delegate_to: "{{ vm_host.name }}" block: - name: start vm virt: @@ -48,7 +48,7 @@ timeout: 10 - name: mark vm as autostarted - delegate_to: "{{ vm_host_cooked.name }}" + delegate_to: "{{ vm_host.name }}" virt: name: "{{ inventory_hostname }}" autostart: "{{ vm_define_autostart }}" diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index 2287dd0b..0430229b 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -1,8 +1,8 @@ <domain type='kvm'> <name>{{ inventory_hostname }}</name> - <memory>{{ ((install_cooked.vm.memory | human_to_bytes) / 1024) | int }}</memory> - <currentMemory>{{ ((install_cooked.vm.memory | human_to_bytes) / 1024) | int }}</currentMemory> - <vcpu>{{ install_cooked.vm.numcpus }}</vcpu> + <memory>{{ ((install.vm.memory | human_to_bytes) / 1024) | int }}</memory> + <currentMemory>{{ ((install.vm.memory | human_to_bytes) / 1024) | int }}</currentMemory> + <vcpu>{{ install.vm.numcpus }}</vcpu> <os> <type arch='x86_64' machine='q35'>hvm</type> {% if vm_define_installer %} @@ -50,18 +50,18 @@ </disk> {% endif %} -{% if install_cooked.disks %} -{% if 'scsi' in install_cooked.disks %} +{% if install.disks %} +{% if 'scsi' in install.disks %} <controller type='scsi' index='0' model='virtio-scsi'/> {% endif %} {% for bus in ['virtio', 'scsi'] %} -{% for device, src in (install_cooked.disks[bus] | default({})).items() %} +{% for device, src in (install.disks[bus] | default({})).items() %} <disk type='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('-', '--') }}'/> {% elif src.type == 'zfs' %} - <source dev='/dev/zvol/{{ vm_host_cooked.zfs[src.backend | default('default')].pool }}/{{ vm_host_cooked.zfs[src.backend | default('default')].name }}/{{ inventory_hostname }}/{{ src.name }}'/> + <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 }}'/> {% endif %} @@ -71,8 +71,8 @@ {% endfor %} {% endif %} -{% if install_cooked.interfaces %} -{% for if in install_cooked.interfaces %} +{% if install.interfaces %} +{% for if in install.interfaces %} <interface type='bridge'> {% if 'mac' in if %} <mac address='{{ if.mac }}'/> |