diff options
Diffstat (limited to 'roles/vm/guest/define')
| -rw-r--r-- | roles/vm/guest/define/tasks/main.yml | 16 | ||||
| -rw-r--r-- | roles/vm/guest/define/templates/libvirt-domain.xml.j2 | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/roles/vm/guest/define/tasks/main.yml b/roles/vm/guest/define/tasks/main.yml index 65094bbb..a4405de1 100644 --- a/roles/vm/guest/define/tasks/main.yml +++ b/roles/vm/guest/define/tasks/main.yml @@ -2,28 +2,28 @@ - name: check if vm already exists delegate_to: "{{ vm_host_cooked.name }}" virt: - name: "{{ install_hostname }}" + name: "{{ inventory_hostname }}" command: info register: vmhost_info - name: remove old vm - when: install_hostname in vmhost_info + when: inventory_hostname in vmhost_info delegate_to: "{{ vm_host_cooked.name }}" block: - name: destroy exisiting vm virt: - name: "{{ install_hostname }}" + name: "{{ inventory_hostname }}" state: destroyed - name: wait for vm to be destroyed wait_for_virt: - name: "{{ install_hostname }}" + name: "{{ inventory_hostname }}" states: shutdown,crashed timeout: 5 - name: undefining exisiting vm virt: - name: "{{ install_hostname }}" + name: "{{ inventory_hostname }}" command: undefine - name: define vm @@ -38,18 +38,18 @@ block: - name: start vm virt: - name: "{{ install_hostname }}" + name: "{{ inventory_hostname }}" state: running - name: wait for VM to start wait_for_virt: - name: "{{ install_hostname }}" + name: "{{ inventory_hostname }}" states: running timeout: 10 - name: mark vm as autostarted delegate_to: "{{ vm_host_cooked.name }}" virt: - name: "{{ install_hostname }}" + name: "{{ inventory_hostname }}" autostart: "{{ vm_define_autostart }}" command: info ## virt module needs either command or state diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index ce8a48d4..28f237a9 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -1,5 +1,5 @@ <domain type='kvm'> - <name>{{ install_hostname }}</name> + <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> @@ -44,7 +44,7 @@ {% if vm_define_installer and install_distro == 'openbsd' %} <disk type='file' device='cdrom'> <driver name='qemu'/> - <source file='{{ installer_tmpdir }}/{{ install_hostname }}.iso'/> + <source file='{{ installer_tmpdir }}/{{ inventory_hostname }}.iso'/> <target dev='hdc' bus='ide'/> <readonly/> </disk> @@ -57,7 +57,7 @@ {% 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 }}/{{ install_hostname }}/{{ src.name }}'/> + <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 }}'/> {% endif %} <target dev='{{ device }}' bus='virtio'/> </disk> @@ -72,7 +72,7 @@ {% 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 }}/{{ install_hostname }}/{{ src.name }}'/> + <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 }}'/> {% endif %} <target dev='{{ device }}' bus='scsi'/> </disk> |