summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-08-02 09:02:41 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-02 09:02:41 +0000
commit989c92844cf3bc1a1f357277e1f90b72521ce731 (patch)
treebb9de68692cb9efce573690fe2598b67e1b915cd
parentc91f763177b26dc05be4ccc8536f4cd76296d983 (diff)
parent48ec887dcf6d7e37d2bebece3bda357a7752dec2 (diff)
Merge "use template to replace duplicate xml file"
-rwxr-xr-xci/deploy/deploy.sh9
-rw-r--r--templates/virtual_environment/vms/computer.xml12
-rw-r--r--templates/virtual_environment/vms/computer01.xml136
-rw-r--r--templates/virtual_environment/vms/computer02.xml136
-rw-r--r--templates/virtual_environment/vms/computer03.xml132
-rw-r--r--templates/virtual_environment/vms/computer04.xml132
-rw-r--r--templates/virtual_environment/vms/controller.xml12
-rw-r--r--templates/virtual_environment/vms/controller01.xml136
-rw-r--r--templates/virtual_environment/vms/controller02.xml136
-rw-r--r--templates/virtual_environment/vms/controller03.xml136
10 files changed, 28 insertions, 949 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 8dbda717..e4a3851b 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -157,8 +157,15 @@ VMDEPLOY_DAISY_SERVER_VM=$WORKSPACE/templates/virtual_environment/vms/daisy.xml
VMDEPLOY_TARGET_NODE_VM=$WORKSPACE/templates/virtual_environment/vms/all_in_one.xml
VMDEPLOY_NODE=[]
-for ((i=0;i<${#VM_MULTINODE[@]};i++));do
+for ((i=0; i < ${#VM_MULTINODE[@]}; i++)); do
+ if [[ ${VM_MULTINODE[$i]} == *controller* ]]; then
+ nodename_prefix="controller"
+ else
+ nodename_prefix="computer"
+ fi
VMDEPLOY_NODE[$i]=$WORKSPACE/templates/virtual_environment/vms/${VM_MULTINODE[$i]}.xml
+ cp $WORKSPACE/templates/virtual_environment/vms/${nodename_prefix}.xml ${VMDEPLOY_NODE[$i]}
+ sed -i "s/nodename/${VM_MULTINODE[$i]}/g" ${VMDEPLOY_NODE[$i]}
echo ${VMDEPLOY_NODE[$i]}
done
diff --git a/templates/virtual_environment/vms/computer.xml b/templates/virtual_environment/vms/computer.xml
index 0add4367..d3c974ed 100644
--- a/templates/virtual_environment/vms/computer.xml
+++ b/templates/virtual_environment/vms/computer.xml
@@ -1,5 +1,5 @@
<domain type='kvm' id='4'>
- <name>computer</name>
+ <name>nodename</name>
<memory unit='KiB'>8388608</memory>
<currentMemory unit='KiB'>8388608</currentMemory>
<vcpu placement='static'>4</vcpu>
@@ -32,12 +32,20 @@
<emulator>/usr/libexec/qemu-kvm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/computer.qcow2'/>
+ <source file='/home/qemu/vms/nodename.qcow2'/>
<backingStore/>
<target dev='hda' bus='ide'/>
<alias name='ide0-0-0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='qcow2'/>
+ <source file='/home/qemu/vms/nodename_data.qcow2'/>
+ <backingStore/>
+ <target dev='hdb' bus='ide'/>
+ <alias name='ide0-0-1'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+ </disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<alias name='usb'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
diff --git a/templates/virtual_environment/vms/computer01.xml b/templates/virtual_environment/vms/computer01.xml
deleted file mode 100644
index 5f7f88ba..00000000
--- a/templates/virtual_environment/vms/computer01.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<domain type='kvm' id='4'>
- <name>computer01</name>
- <memory unit='KiB'>8388608</memory>
- <currentMemory unit='KiB'>8388608</currentMemory>
- <vcpu placement='static'>4</vcpu>
- <resource>
- <partition>/machine</partition>
- </resource>
- <os>
- <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
- <boot dev='network'/>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- </features>
- <cpu mode="host-model"/>
- <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/libexec/qemu-kvm</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/computer01.qcow2'/>
- <backingStore/>
- <target dev='hda' bus='ide'/>
- <alias name='ide0-0-0'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/computer01_data.qcow2'/>
- <backingStore/>
- <target dev='hdb' bus='ide'/>
- <alias name='ide0-0-1'/>
- <address type='drive' controller='0' bus='0' target='0' unit='1'/>
- </disk>
- <controller type='usb' index='0' model='ich9-ehci1'>
- <alias name='usb'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci1'>
- <alias name='usb'/>
- <master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci2'>
- <alias name='usb'/>
- <master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci3'>
- <alias name='usb'/>
- <master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'>
- <alias name='pci.0'/>
- </controller>
- <controller type='ide' index='0'>
- <alias name='ide'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
- </controller>
- <controller type='virtio-serial' index='0'>
- <alias name='virtio-serial0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
- </controller>
- <interface type='network'>
- <source network='daisy1' bridge='daisy1'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy2' bridge='daisy2'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy3' bridge='daisy3'/>
- <model type='rtl8139'/>
- </interface>
- <serial type='pty'>
- <source path='/dev/pts/4'/>
- <target port='0'/>
- <alias name='serial0'/>
- </serial>
- <console type='pty' tty='/dev/pts/4'>
- <source path='/dev/pts/4'/>
- <target type='serial' port='0'/>
- <alias name='serial0'/>
- </console>
- <channel type='spicevmc'>
- <target type='virtio' name='com.redhat.spice.0' state='connected'/>
- <alias name='channel0'/>
- <address type='virtio-serial' controller='0' bus='0' port='1'/>
- </channel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='spice' port='5903' autoport='yes' listen='127.0.0.1'>
- <listen type='address' address='127.0.0.1'/>
- <image compression='off'/>
- </graphics>
- <sound model='ich6'>
- <alias name='sound0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
- </sound>
- <video>
- <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/>
- <alias name='video0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
- </video>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir0'/>
- </redirdev>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir1'/>
- </redirdev>
- <memballoon model='virtio'>
- <alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
- </memballoon>
- </devices>
- <seclabel type='dynamic' model='selinux' relabel='yes'>
- <label>system_u:system_r:svirt_t:s0:c182,c195</label>
- <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel>
- </seclabel>
-</domain>
diff --git a/templates/virtual_environment/vms/computer02.xml b/templates/virtual_environment/vms/computer02.xml
deleted file mode 100644
index bad307cf..00000000
--- a/templates/virtual_environment/vms/computer02.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<domain type='kvm' id='4'>
- <name>computer02</name>
- <memory unit='KiB'>8388608</memory>
- <currentMemory unit='KiB'>8388608</currentMemory>
- <vcpu placement='static'>4</vcpu>
- <resource>
- <partition>/machine</partition>
- </resource>
- <os>
- <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
- <boot dev='network'/>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- </features>
- <cpu mode="host-model"/>
- <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/libexec/qemu-kvm</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/computer02.qcow2'/>
- <backingStore/>
- <target dev='hda' bus='ide'/>
- <alias name='ide0-0-0'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/computer02_data.qcow2'/>
- <backingStore/>
- <target dev='hdb' bus='ide'/>
- <alias name='ide0-0-1'/>
- <address type='drive' controller='0' bus='0' target='0' unit='1'/>
- </disk>
- <controller type='usb' index='0' model='ich9-ehci1'>
- <alias name='usb'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci1'>
- <alias name='usb'/>
- <master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci2'>
- <alias name='usb'/>
- <master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci3'>
- <alias name='usb'/>
- <master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'>
- <alias name='pci.0'/>
- </controller>
- <controller type='ide' index='0'>
- <alias name='ide'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
- </controller>
- <controller type='virtio-serial' index='0'>
- <alias name='virtio-serial0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
- </controller>
- <interface type='network'>
- <source network='daisy1' bridge='daisy1'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy2' bridge='daisy2'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy3' bridge='daisy3'/>
- <model type='rtl8139'/>
- </interface>
- <serial type='pty'>
- <source path='/dev/pts/4'/>
- <target port='0'/>
- <alias name='serial0'/>
- </serial>
- <console type='pty' tty='/dev/pts/4'>
- <source path='/dev/pts/4'/>
- <target type='serial' port='0'/>
- <alias name='serial0'/>
- </console>
- <channel type='spicevmc'>
- <target type='virtio' name='com.redhat.spice.0' state='connected'/>
- <alias name='channel0'/>
- <address type='virtio-serial' controller='0' bus='0' port='1'/>
- </channel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='spice' port='5903' autoport='yes' listen='127.0.0.1'>
- <listen type='address' address='127.0.0.1'/>
- <image compression='off'/>
- </graphics>
- <sound model='ich6'>
- <alias name='sound0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
- </sound>
- <video>
- <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/>
- <alias name='video0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
- </video>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir0'/>
- </redirdev>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir1'/>
- </redirdev>
- <memballoon model='virtio'>
- <alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
- </memballoon>
- </devices>
- <seclabel type='dynamic' model='selinux' relabel='yes'>
- <label>system_u:system_r:svirt_t:s0:c182,c195</label>
- <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel>
- </seclabel>
-</domain>
diff --git a/templates/virtual_environment/vms/computer03.xml b/templates/virtual_environment/vms/computer03.xml
deleted file mode 100644
index 235ff745..00000000
--- a/templates/virtual_environment/vms/computer03.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<domain type='kvm' id='4'>
- <name>computer03</name>
- <memory unit='KiB'>8388608</memory>
- <currentMemory unit='KiB'>8388608</currentMemory>
- <vcpu placement='static'>4</vcpu>
- <resource>
- <partition>/machine</partition>
- </resource>
- <os>
- <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
- <boot dev='network'/>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- </features>
- <cpu mode="host-model"/>
- <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/libexec/qemu-kvm</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/computer03.qcow2'/>
- <backingStore/>
- <target dev='hda' bus='ide'/>
- <alias name='ide0-0-0'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/computer03_data.qcow2'/>
- <backingStore/>
- <target dev='hdb' bus='ide'/>
- <alias name='ide0-0-1'/>
- <address type='drive' controller='0' bus='0' target='0' unit='1'/>
- </disk>
- <controller type='usb' index='0' model='ich9-ehci1'>
- <alias name='usb'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci1'>
- <alias name='usb'/>
- <master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci2'>
- <alias name='usb'/>
- <master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci3'>
- <alias name='usb'/>
- <master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'>
- <alias name='pci.0'/>
- </controller>
- <controller type='ide' index='0'>
- <alias name='ide'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
- </controller>
- <controller type='virtio-serial' index='0'>
- <alias name='virtio-serial0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
- </controller>
- <interface type='network'>
- <source network='daisy1' bridge='daisy1'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy2' bridge='daisy2'/>
- <model type='rtl8139'/>
- </interface>
- <serial type='pty'>
- <source path='/dev/pts/4'/>
- <target port='0'/>
- <alias name='serial0'/>
- </serial>
- <console type='pty' tty='/dev/pts/4'>
- <source path='/dev/pts/4'/>
- <target type='serial' port='0'/>
- <alias name='serial0'/>
- </console>
- <channel type='spicevmc'>
- <target type='virtio' name='com.redhat.spice.0' state='connected'/>
- <alias name='channel0'/>
- <address type='virtio-serial' controller='0' bus='0' port='1'/>
- </channel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='spice' port='5903' autoport='yes' listen='127.0.0.1'>
- <listen type='address' address='127.0.0.1'/>
- <image compression='off'/>
- </graphics>
- <sound model='ich6'>
- <alias name='sound0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
- </sound>
- <video>
- <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/>
- <alias name='video0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
- </video>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir0'/>
- </redirdev>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir1'/>
- </redirdev>
- <memballoon model='virtio'>
- <alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
- </memballoon>
- </devices>
- <seclabel type='dynamic' model='selinux' relabel='yes'>
- <label>system_u:system_r:svirt_t:s0:c182,c195</label>
- <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel>
- </seclabel>
-</domain>
diff --git a/templates/virtual_environment/vms/computer04.xml b/templates/virtual_environment/vms/computer04.xml
deleted file mode 100644
index 2a5cd3aa..00000000
--- a/templates/virtual_environment/vms/computer04.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<domain type='kvm' id='4'>
- <name>computer04</name>
- <memory unit='KiB'>8388608</memory>
- <currentMemory unit='KiB'>8388608</currentMemory>
- <vcpu placement='static'>4</vcpu>
- <resource>
- <partition>/machine</partition>
- </resource>
- <os>
- <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
- <boot dev='network'/>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- </features>
- <cpu mode="host-model"/>
- <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/libexec/qemu-kvm</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/computer04.qcow2'/>
- <backingStore/>
- <target dev='hda' bus='ide'/>
- <alias name='ide0-0-0'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/computer04_data.qcow2'/>
- <backingStore/>
- <target dev='hdb' bus='ide'/>
- <alias name='ide0-0-1'/>
- <address type='drive' controller='0' bus='0' target='0' unit='1'/>
- </disk>
- <controller type='usb' index='0' model='ich9-ehci1'>
- <alias name='usb'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci1'>
- <alias name='usb'/>
- <master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci2'>
- <alias name='usb'/>
- <master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci3'>
- <alias name='usb'/>
- <master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'>
- <alias name='pci.0'/>
- </controller>
- <controller type='ide' index='0'>
- <alias name='ide'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
- </controller>
- <controller type='virtio-serial' index='0'>
- <alias name='virtio-serial0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
- </controller>
- <interface type='network'>
- <source network='daisy1' bridge='daisy1'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy2' bridge='daisy2'/>
- <model type='rtl8139'/>
- </interface>
- <serial type='pty'>
- <source path='/dev/pts/4'/>
- <target port='0'/>
- <alias name='serial0'/>
- </serial>
- <console type='pty' tty='/dev/pts/4'>
- <source path='/dev/pts/4'/>
- <target type='serial' port='0'/>
- <alias name='serial0'/>
- </console>
- <channel type='spicevmc'>
- <target type='virtio' name='com.redhat.spice.0' state='connected'/>
- <alias name='channel0'/>
- <address type='virtio-serial' controller='0' bus='0' port='1'/>
- </channel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='spice' port='5903' autoport='yes' listen='127.0.0.1'>
- <listen type='address' address='127.0.0.1'/>
- <image compression='off'/>
- </graphics>
- <sound model='ich6'>
- <alias name='sound0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
- </sound>
- <video>
- <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/>
- <alias name='video0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
- </video>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir0'/>
- </redirdev>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir1'/>
- </redirdev>
- <memballoon model='virtio'>
- <alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
- </memballoon>
- </devices>
- <seclabel type='dynamic' model='selinux' relabel='yes'>
- <label>system_u:system_r:svirt_t:s0:c182,c195</label>
- <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel>
- </seclabel>
-</domain>
diff --git a/templates/virtual_environment/vms/controller.xml b/templates/virtual_environment/vms/controller.xml
index 72d255e6..0b605104 100644
--- a/templates/virtual_environment/vms/controller.xml
+++ b/templates/virtual_environment/vms/controller.xml
@@ -1,5 +1,5 @@
<domain type='kvm' id='4'>
- <name>controller</name>
+ <name>nodename</name>
<memory unit='KiB'>12582912</memory>
<currentMemory unit='KiB'>12582912</currentMemory>
<vcpu placement='static'>4</vcpu>
@@ -32,12 +32,20 @@
<emulator>/usr/libexec/qemu-kvm</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/controller.qcow2'/>
+ <source file='/home/qemu/vms/nodename.qcow2'/>
<backingStore/>
<target dev='hda' bus='ide'/>
<alias name='ide0-0-0'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='qcow2'/>
+ <source file='/home/qemu/vms/nodename_data.qcow2'/>
+ <backingStore/>
+ <target dev='hdb' bus='ide'/>
+ <alias name='ide0-0-1'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+ </disk>
<controller type='usb' index='0' model='ich9-ehci1'>
<alias name='usb'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
diff --git a/templates/virtual_environment/vms/controller01.xml b/templates/virtual_environment/vms/controller01.xml
deleted file mode 100644
index e2919996..00000000
--- a/templates/virtual_environment/vms/controller01.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<domain type='kvm' id='4'>
- <name>controller01</name>
- <memory unit='KiB'>8388608</memory>
- <currentMemory unit='KiB'>8388608</currentMemory>
- <vcpu placement='static'>4</vcpu>
- <resource>
- <partition>/machine</partition>
- </resource>
- <os>
- <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
- <boot dev='network'/>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- </features>
- <cpu mode="host-model"/>
- <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/libexec/qemu-kvm</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/controller01.qcow2'/>
- <backingStore/>
- <target dev='hda' bus='ide'/>
- <alias name='ide0-0-0'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/controller01_data.qcow2'/>
- <backingStore/>
- <target dev='hdb' bus='ide'/>
- <alias name='ide0-0-1'/>
- <address type='drive' controller='0' bus='0' target='0' unit='1'/>
- </disk>
- <controller type='usb' index='0' model='ich9-ehci1'>
- <alias name='usb'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci1'>
- <alias name='usb'/>
- <master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci2'>
- <alias name='usb'/>
- <master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci3'>
- <alias name='usb'/>
- <master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'>
- <alias name='pci.0'/>
- </controller>
- <controller type='ide' index='0'>
- <alias name='ide'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
- </controller>
- <controller type='virtio-serial' index='0'>
- <alias name='virtio-serial0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
- </controller>
- <interface type='network'>
- <source network='daisy1' bridge='daisy1'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy2' bridge='daisy2'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy3' bridge='daisy3'/>
- <model type='rtl8139'/>
- </interface>
- <serial type='pty'>
- <source path='/dev/pts/4'/>
- <target port='0'/>
- <alias name='serial0'/>
- </serial>
- <console type='pty' tty='/dev/pts/4'>
- <source path='/dev/pts/4'/>
- <target type='serial' port='0'/>
- <alias name='serial0'/>
- </console>
- <channel type='spicevmc'>
- <target type='virtio' name='com.redhat.spice.0' state='connected'/>
- <alias name='channel0'/>
- <address type='virtio-serial' controller='0' bus='0' port='1'/>
- </channel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='spice' port='5903' autoport='yes' listen='127.0.0.1'>
- <listen type='address' address='127.0.0.1'/>
- <image compression='off'/>
- </graphics>
- <sound model='ich6'>
- <alias name='sound0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
- </sound>
- <video>
- <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/>
- <alias name='video0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
- </video>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir0'/>
- </redirdev>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir1'/>
- </redirdev>
- <memballoon model='virtio'>
- <alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
- </memballoon>
- </devices>
- <seclabel type='dynamic' model='selinux' relabel='yes'>
- <label>system_u:system_r:svirt_t:s0:c182,c195</label>
- <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel>
- </seclabel>
-</domain>
diff --git a/templates/virtual_environment/vms/controller02.xml b/templates/virtual_environment/vms/controller02.xml
deleted file mode 100644
index cec3c517..00000000
--- a/templates/virtual_environment/vms/controller02.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<domain type='kvm' id='4'>
- <name>controller02</name>
- <memory unit='KiB'>8388608</memory>
- <currentMemory unit='KiB'>8388608</currentMemory>
- <vcpu placement='static'>4</vcpu>
- <resource>
- <partition>/machine</partition>
- </resource>
- <os>
- <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
- <boot dev='network'/>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- </features>
- <cpu mode="host-model"/>
- <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/libexec/qemu-kvm</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/controller02.qcow2'/>
- <backingStore/>
- <target dev='hda' bus='ide'/>
- <alias name='ide0-0-0'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/controller02_data.qcow2'/>
- <backingStore/>
- <target dev='hdb' bus='ide'/>
- <alias name='ide0-0-1'/>
- <address type='drive' controller='0' bus='0' target='0' unit='1'/>
- </disk>
- <controller type='usb' index='0' model='ich9-ehci1'>
- <alias name='usb'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci1'>
- <alias name='usb'/>
- <master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci2'>
- <alias name='usb'/>
- <master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci3'>
- <alias name='usb'/>
- <master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'>
- <alias name='pci.0'/>
- </controller>
- <controller type='ide' index='0'>
- <alias name='ide'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
- </controller>
- <controller type='virtio-serial' index='0'>
- <alias name='virtio-serial0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
- </controller>
- <interface type='network'>
- <source network='daisy1' bridge='daisy1'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy2' bridge='daisy2'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy3' bridge='daisy3'/>
- <model type='rtl8139'/>
- </interface>
- <serial type='pty'>
- <source path='/dev/pts/4'/>
- <target port='0'/>
- <alias name='serial0'/>
- </serial>
- <console type='pty' tty='/dev/pts/4'>
- <source path='/dev/pts/4'/>
- <target type='serial' port='0'/>
- <alias name='serial0'/>
- </console>
- <channel type='spicevmc'>
- <target type='virtio' name='com.redhat.spice.0' state='connected'/>
- <alias name='channel0'/>
- <address type='virtio-serial' controller='0' bus='0' port='1'/>
- </channel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='spice' port='5903' autoport='yes' listen='127.0.0.1'>
- <listen type='address' address='127.0.0.1'/>
- <image compression='off'/>
- </graphics>
- <sound model='ich6'>
- <alias name='sound0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
- </sound>
- <video>
- <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/>
- <alias name='video0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
- </video>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir0'/>
- </redirdev>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir1'/>
- </redirdev>
- <memballoon model='virtio'>
- <alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
- </memballoon>
- </devices>
- <seclabel type='dynamic' model='selinux' relabel='yes'>
- <label>system_u:system_r:svirt_t:s0:c182,c195</label>
- <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel>
- </seclabel>
-</domain>
diff --git a/templates/virtual_environment/vms/controller03.xml b/templates/virtual_environment/vms/controller03.xml
deleted file mode 100644
index b86f82b9..00000000
--- a/templates/virtual_environment/vms/controller03.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<domain type='kvm' id='4'>
- <name>controller03</name>
- <memory unit='KiB'>8388608</memory>
- <currentMemory unit='KiB'>8388608</currentMemory>
- <vcpu placement='static'>4</vcpu>
- <resource>
- <partition>/machine</partition>
- </resource>
- <os>
- <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type>
- <boot dev='network'/>
- <boot dev='hd'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- </features>
- <cpu mode="host-model"/>
- <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/libexec/qemu-kvm</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/controller03.qcow2'/>
- <backingStore/>
- <target dev='hda' bus='ide'/>
- <alias name='ide0-0-0'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/home/qemu/vms/controller03_data.qcow2'/>
- <backingStore/>
- <target dev='hdb' bus='ide'/>
- <alias name='ide0-0-1'/>
- <address type='drive' controller='0' bus='0' target='0' unit='1'/>
- </disk>
- <controller type='usb' index='0' model='ich9-ehci1'>
- <alias name='usb'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x7'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci1'>
- <alias name='usb'/>
- <master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0' multifunction='on'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci2'>
- <alias name='usb'/>
- <master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x1'/>
- </controller>
- <controller type='usb' index='0' model='ich9-uhci3'>
- <alias name='usb'/>
- <master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x2'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'>
- <alias name='pci.0'/>
- </controller>
- <controller type='ide' index='0'>
- <alias name='ide'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
- </controller>
- <controller type='virtio-serial' index='0'>
- <alias name='virtio-serial0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
- </controller>
- <interface type='network'>
- <source network='daisy1' bridge='daisy1'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy2' bridge='daisy2'/>
- <model type='rtl8139'/>
- </interface>
- <interface type='network'>
- <source network='daisy3' bridge='daisy3'/>
- <model type='rtl8139'/>
- </interface>
- <serial type='pty'>
- <source path='/dev/pts/4'/>
- <target port='0'/>
- <alias name='serial0'/>
- </serial>
- <console type='pty' tty='/dev/pts/4'>
- <source path='/dev/pts/4'/>
- <target type='serial' port='0'/>
- <alias name='serial0'/>
- </console>
- <channel type='spicevmc'>
- <target type='virtio' name='com.redhat.spice.0' state='connected'/>
- <alias name='channel0'/>
- <address type='virtio-serial' controller='0' bus='0' port='1'/>
- </channel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='spice' port='5903' autoport='yes' listen='127.0.0.1'>
- <listen type='address' address='127.0.0.1'/>
- <image compression='off'/>
- </graphics>
- <sound model='ich6'>
- <alias name='sound0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
- </sound>
- <video>
- <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/>
- <alias name='video0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
- </video>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir0'/>
- </redirdev>
- <redirdev bus='usb' type='spicevmc'>
- <alias name='redir1'/>
- </redirdev>
- <memballoon model='virtio'>
- <alias name='balloon0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
- </memballoon>
- </devices>
- <seclabel type='dynamic' model='selinux' relabel='yes'>
- <label>system_u:system_r:svirt_t:s0:c182,c195</label>
- <imagelabel>system_u:object_r:svirt_image_t:s0:c182,c195</imagelabel>
- </seclabel>
-</domain>