Taskotron: Remove custom domain-template.jinja
Use the file distributed by upstream testcloud
This commit is contained in:
parent
c37ef9a504
commit
996bb410fb
2 changed files with 0 additions and 63 deletions
|
@ -1,59 +0,0 @@
|
||||||
<domain type='kvm'>
|
|
||||||
<name>{{ domain_name }}</name>
|
|
||||||
<uuid>{{ uuid }}</uuid>
|
|
||||||
<memory unit='KiB'>{{ memory }}</memory>
|
|
||||||
<currentMemory unit='KiB'>{{ memory }}</currentMemory>
|
|
||||||
<vcpu placement='static'>1</vcpu>
|
|
||||||
<os>
|
|
||||||
<type arch='x86_64' machine='pc'>hvm</type>
|
|
||||||
<boot dev='hd'/>
|
|
||||||
</os>
|
|
||||||
<cpu mode='host-passthrough'/>
|
|
||||||
<clock offset='utc'>
|
|
||||||
<timer name='rtc' tickpolicy='catchup'/>
|
|
||||||
<timer name='pit' tickpolicy='delay'/>
|
|
||||||
<timer name='hpet' present='no'/>
|
|
||||||
</clock>
|
|
||||||
<on_poweroff>destroy</on_poweroff>
|
|
||||||
<on_reboot>restart</on_reboot>
|
|
||||||
<on_crash>restart</on_crash>
|
|
||||||
<pm>
|
|
||||||
<suspend-to-mem enabled='no'/>
|
|
||||||
<suspend-to-disk enabled='no'/>
|
|
||||||
</pm>
|
|
||||||
<devices>
|
|
||||||
<emulator>/usr/bin/qemu-kvm</emulator>
|
|
||||||
<disk type='file' device='disk'>
|
|
||||||
<driver name='qemu' type='qcow2'/>
|
|
||||||
<source file="{{ disk }}"/>
|
|
||||||
<target dev='vda' bus='virtio'/>
|
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
|
|
||||||
</disk>
|
|
||||||
<disk type='file' device='disk'>
|
|
||||||
<driver name='qemu' type='raw'/>
|
|
||||||
<source file="{{ seed }}"/>
|
|
||||||
<target dev='vdb' bus='virtio'/>
|
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
|
|
||||||
</disk>
|
|
||||||
<interface type='network'>
|
|
||||||
<mac address="{{ mac_address }}"/>
|
|
||||||
<source network='default'/>
|
|
||||||
<model type='rtl8139'/>
|
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
||||||
</interface>
|
|
||||||
<serial type='pty'>
|
|
||||||
<target port='0'/>
|
|
||||||
</serial>
|
|
||||||
<console type='pty'>
|
|
||||||
<target type='serial' port='0'/>
|
|
||||||
</console>
|
|
||||||
<input type='keyboard' bus='ps2'/>
|
|
||||||
<memballoon model='virtio'>
|
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
|
|
||||||
</memballoon>
|
|
||||||
<rng model='virtio'>
|
|
||||||
<backend model='random'>/dev/random</backend>
|
|
||||||
</rng>
|
|
||||||
</devices>
|
|
||||||
</domain>
|
|
||||||
|
|
|
@ -131,7 +131,3 @@
|
||||||
- name: setup nested virt on virthosts with nested=true variable
|
- name: setup nested virt on virthosts with nested=true variable
|
||||||
copy: src=kvm_intel.conf dest=/etc/modprobe.d/kvm_intel.conf
|
copy: src=kvm_intel.conf dest=/etc/modprobe.d/kvm_intel.conf
|
||||||
when: nested == true
|
when: nested == true
|
||||||
|
|
||||||
- name: copy domain xml for testcloud that allows nested virt
|
|
||||||
copy: src=domain-template.jinja dest=/var/lib/testcloud/domain-template.jinja owner=qemu group=testcloud mode=0764
|
|
||||||
when: deployment_type in ['dev', 'stg', 'prod']
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue