diff --git a/templates/libvirt/xen.xml b/templates/libvirt/xen.xml index a16ff581..218530f4 100644 --- a/templates/libvirt/xen.xml +++ b/templates/libvirt/xen.xml @@ -1,31 +1,31 @@ {% if prepare_dvm %}%NAME%{% else %}{{ vm.name }}{% endif %} - {{ vm.uuid }} - {{ vm.maxmem }} - {{ vm.memory }} - {{ vm.vcpus }} - - {% if vm.hvm %} - hvm - hvmloader - - + {{ vm.uuid }} + {{ vm.maxmem }} + {{ vm.memory }} + {{ vm.vcpus }} + + {% if vm.hvm %} + hvm + hvmloader + + - {% else %} - linux - {{ vm.storage.kernels_dir }}/vmlinuz - {{ vm.storage.kernels_dir }}/initramfs - root=/dev/mapper/dmroot ro nomodeset console=hvc0 rd_NO_PLYMOUTH 3 {{ vm.kernelopts }} - {% endif %} - + {% else %} + linux + {{ vm.storage.kernels_dir }}/vmlinuz + {{ vm.storage.kernels_dir }}/initramfs + root=/dev/mapper/dmroot ro nomodeset console=hvc0 rd_NO_PLYMOUTH 3 {{ vm.kernelopts }} + {% endif %} + - {% if vm.hvm %} - - - - - - + {% if vm.hvm %} + + + + + + {% set timezone = vm.features.check_with_template('timezone', 'localtime').lower() %} {% if timezone == 'localtime' %} @@ -35,22 +35,22 @@ {% else %} {% endif %} - {% else %} - - - - {% endif %} + {% else %} + + + + {% endif %} - destroy - destroy - destroy - + destroy + destroy + destroy + {% set i = 0 %} {# TODO Allow more volumes out of the box #} {% set dd = ['e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y'] %} - {% for device in vm.block_devices %} + {% for device in vm.block_devices %} @@ -79,23 +79,23 @@ {% endif %} - {% endfor %} + {% endfor %} - {% if vm.netvm %} - - + {% if vm.netvm %} + + - + - - {% endif %} + + {% endif %} - {% for device in vm.devices.pci %} + {% for device in vm.devices.pci %}
- {% endfor %} + {% endfor %} - {% if vm.hvm %} + {% if vm.hvm %} - -