openstack/bifrost
Code Issues Proposed changes

roles: bifrost-create-vm-nodes: Allow overriding the disk caching method

Browse Source 
Allow users to override the disk caching method used by the VMs.

Change-Id: I795441f4e6c84dc513814a9af91ad25332a01c16
This commit is contained in:
Markos Chandras 2017-01-30 15:58:21 +00:00
parent a59bbd79d5
commit b7a861ce34
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/roles/bifrost-create-vm-nodes/files/create_vm_nodes-for-role.sh
View File

@ -46,6 +46,7 @@ VM_CPU=${VM_CPU:-1}
VM_RAM=${VM_RAM:-3072} VM_RAM=${VM_RAM:-3072}
VM_DISK=${VM_DISK:-10} VM_DISK=${VM_DISK:-10}
VM_MACHINE="pc-1.0" VM_MACHINE="pc-1.0"
VM_DISK_CACHE=${VM_DISK_CACHE:-writeback}
function is_distro { function is_distro {
local os_release=false local os_release=false
@ -94,6 +95,7 @@ function create_node {
# extra G to allow fuzz for partition table : flavor size and registered # extra G to allow fuzz for partition table : flavor size and registered
# size need to be different to actual size. # size need to be different to actual size.
DISK=$(( $4 + 1)) DISK=$(( $4 + 1))
DISK_CACHE=${10}
case $5 in case $5 in
i386) ARCH='i686' ;; i386) ARCH='i686' ;;
@ -177,7 +179,7 @@ function create_node {
<devices> <devices>
<emulator>${EMULATOR}</emulator> <emulator>${EMULATOR}</emulator>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='writeback'/> <driver name='qemu' type='qcow2' cache='${DISK_CACHE}'/>
<source file='${volume_path}'/> <source file='${volume_path}'/>
<target dev='vda' bus='virtio'/> <target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
@ -266,7 +268,7 @@ do
name=${names[$arrayindex]} name=${names[$arrayindex]}
fi fi
mac=$(create_node $name $VM_CPU $VM_RAM $VM_DISK amd64 $VM_NET_BRIDGE $VM_EMULATOR $VM_LOGDIR $VM_DOMAIN_TYPE) mac=$(create_node $name $VM_CPU $VM_RAM $VM_DISK amd64 $VM_NET_BRIDGE $VM_EMULATOR $VM_LOGDIR $VM_DOMAIN_TYPE $VM_DISK_CACHE)
printf "$mac,root,undefined,192.168.122.1,$VM_CPU,$VM_RAM,$VM_DISK,flavor,type,a8cb6624-0d9f-c882-affc-046ebb96ec0${i},$name,192.168.122.$((i+1))\n" >>$TEMPFILE printf "$mac,root,undefined,192.168.122.1,$VM_CPU,$VM_RAM,$VM_DISK,flavor,type,a8cb6624-0d9f-c882-affc-046ebb96ec0${i},$name,192.168.122.$((i+1))\n" >>$TEMPFILE
done done