diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-06-11 17:53:55 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-06-12 00:29:17 +0200 |
| commit | 607bc14c38dcd0b416f4caefdcb41b0a74012a55 (patch) | |
| tree | c7c7a8a3a3f6add10f44b46ab8c01d5093a5cc6f /roles/vm/define | |
| parent | sk-cloudia: update nextcloud and jitsi-meet (diff) | |
harmonize vm install config
Diffstat (limited to 'roles/vm/define')
| -rw-r--r-- | roles/vm/define/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/vm/define/templates/libvirt-domain.xml.j2 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/vm/define/defaults/main.yml b/roles/vm/define/defaults/main.yml index 29884a9b..f0bcc4fd 100644 --- a/roles/vm/define/defaults/main.yml +++ b/roles/vm/define/defaults/main.yml @@ -1,5 +1,5 @@ --- -vm_define_autostart: "{{ not vm_define_installer and hostvars[install_hostname].install_cooked.autostart | default(False) }}" +vm_define_autostart: "{{ not vm_define_installer and hostvars[install_hostname].install_cooked.vm.autostart | default(False) }}" vm_define_start: yes vm_define_installer: no diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2 index 5e7f8f1f..af9fbf52 100644 --- a/roles/vm/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/define/templates/libvirt-domain.xml.j2 @@ -1,8 +1,8 @@ <domain type='kvm'> <name>{{ install_hostname }}</name> - <memory>{{ hostvars[install_hostname].install_cooked.mem * 1024 }}</memory> - <currentMemory>{{ hostvars[install_hostname].install_cooked.mem * 1024 }}</currentMemory> - <vcpu>{{ hostvars[install_hostname].install_cooked.numcpu }}</vcpu> + <memory>{{ hostvars[install_hostname].install_cooked.vm.mem * 1024 }}</memory> + <currentMemory>{{ hostvars[install_hostname].install_cooked.vm.mem * 1024 }}</currentMemory> + <vcpu>{{ hostvars[install_hostname].install_cooked.vm.numcpu }}</vcpu> <os> <type arch='x86_64' machine='pc-0.12'>hvm</type> {% if vm_define_installer %} |