projects
/
noc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vm-update: Use post_tasks rather than explicit flush_handlers
[noc.git]
/
ansible
/
roles
/
vm
/
install
/
templates
/
libvirt-domain.xml.j2
diff --git
a/ansible/roles/vm/install/templates/libvirt-domain.xml.j2
b/ansible/roles/vm/install/templates/libvirt-domain.xml.j2
index
81c732a
..
ff2ee60
100644
(file)
--- a/
ansible/roles/vm/install/templates/libvirt-domain.xml.j2
+++ b/
ansible/roles/vm/install/templates/libvirt-domain.xml.j2
@@
-5,9
+5,9
@@
<vcpu>{{ hostvars[hostname].install_cooked.numcpu }}</vcpu>
<os>
<type arch='x86_64' machine='pc-0.12'>hvm</type>
<vcpu>{{ hostvars[hostname].install_cooked.numcpu }}</vcpu>
<os>
<type arch='x86_64' machine='pc-0.12'>hvm</type>
-{% if run_installer %}
+{% if run_installer | default(False) %}
<kernel>{{ debian_installer_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[hostname].install_cooked.arch | default('amd64') }}/linux</kernel>
<kernel>{{ debian_installer_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[hostname].install_cooked.arch | default('amd64') }}/linux</kernel>
- <initrd>{{ preseed_path }}/{{ hostname }}-{{ install_distro }}-{{ install_codename }}.initrd.gz</initrd>
+ <initrd>{{ preseed_tmpdir }}/initrd.preseed.gz</initrd>
<cmdline>console=ttyS0,115200n8</cmdline>
{% endif %}
<boot dev='hd'/>
<cmdline>console=ttyS0,115200n8</cmdline>
{% endif %}
<boot dev='hd'/>
@@
-19,7
+19,7
@@
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
-{% if run_installer %}
+{% if run_installer | default(False) %}
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
{% else %}
<on_reboot>destroy</on_reboot>
<on_crash>destroy</on_crash>
{% else %}