Fix some issues

1. Fix nested virtualization
2. cleanup dpdk & non-dpdk
3. Add to download iso

Change-Id: I4b721ec01f745ef699caf5e85b8566ed76612e9e
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
This commit is contained in:
Guo Ruijing 2016-08-10 10:16:37 +08:00
parent a4b36af636
commit 6616fc9fad
3 changed files with 10 additions and 11 deletions

View File

@ -3,6 +3,8 @@
DNS_SERVER=${DNS_SERVER:-10.248.2.1}
SUPPORT_DPDK=${SUPPORT_DPDK:-false}
ls *.iso &> /dev/null || (echo "pls download fuel iso here" && exit 0)
#setup ntp server
sudo service ntp restart
@ -80,17 +82,17 @@ done
if [ $SUPPORT_DPDK = 'true' ]
then
fuel_slave='fuel-slave-dpdk'
fuel_slave_xml='fuel-slave-dpdk.xml'
else
fuel_slave='fuel-slave'
fuel_slave_xml='fuel-slave.xml'
fi
#setup slave
for i in {1..4}; do
sudo virsh destroy fuel-slave-$i
sudo rm -rf /var/lib/libvirt/images/$fuel_slave-${i}.img
sudo qemu-img create -f qcow2 /var/lib/libvirt/images/$fuel_slave-${i}.img 200G
sed "s/FUEL_SLAVE/fuel-slave-$i/g" $fuel_slave.xml > vms/$fuel_slave-${i}.xml
sudo virsh create vms/$fuel_slave-${i}.xml
sudo rm -rf /var/lib/libvirt/images/fuel-slave-${i}.img
sudo qemu-img create -f qcow2 /var/lib/libvirt/images/fuel-slave-${i}.img 200G
sed "s/FUEL_SLAVE/fuel-slave-$i/g" $fuel_slave_xml > vms/fuel-slave-${i}.xml
sudo virsh create vms/fuel-slave-${i}.xml
done
#setup web browser

View File

@ -31,6 +31,7 @@
<feature policy='require' name='ssse3'/>
<feature policy='require' name='sse4.1'/>
<feature policy='require' name='sse4.2'/>
<feature policy='require' name='vmx'/>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>

View File

@ -19,6 +19,7 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>SandyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='vmx'/>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
@ -50,11 +51,6 @@
<model type='e1000' />
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</interface>
<interface type='bridge'>
<source bridge='br-dpdk'/>
<model type='e1000' />
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
</interface>
<serial type='pty'>
<source path='/dev/pts/20'/>
<target port='0'/>