openstack/devstack-gate
Code Issues Proposed changes

Extract method fix_disk_layout

Browse Source 
Extract the work arounds for HP cloud guest disk layout to a
seperate function.

Change-Id: Ib4a351c229407425c38655f20471baa28969e424
This commit is contained in:
Sean Dague
2013-11-01 15:28:21 -04:00
parent c34b32cf50
commit d9f702ef42
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
devstack-vm-gate-wrap.sh
View File

@@ -39,6 +39,23 @@ function git_checkout {
git clean -x -f -d -q
}
function fix_disk_layout {
# Hpcloud provides no swap, but does have a virtual disk mounted
# at /mnt we can use. It also doesn't have enough space on / for
# two devstack installs, so we partition the vdisk:
if [ `grep SwapTotal /proc/meminfo | awk '{ print $2; }'` -eq 0 ] && \
[ -b /dev/vdb ]; then
sudo umount /dev/vdb
sudo parted /dev/vdb --script -- mklabel msdos
sudo parted /dev/vdb --script -- mkpart primary linux-swap 0 8192
sudo parted /dev/vdb --script -- mkpart primary ext2 8192 -1
sudo mkswap /dev/vdb1
sudo mkfs.ext4 /dev/vdb2
sudo swapon /dev/vdb1
sudo mount /dev/vdb2 /opt
fi
}
function setup_workspace {
local base_branch=$1
local DEST=$2
@@ -56,20 +73,7 @@ function setup_workspace {
sudo bash -c 'echo "127.0.1.1 $HOSTNAME" >>/etc/hosts'
fi
# Hpcloud provides no swap, but does have a virtual disk mounted
# at /mnt we can use. It also doesn't have enough space on / for
# two devstack installs, so we partition the vdisk:
if [ `grep SwapTotal /proc/meminfo | awk '{ print $2; }'` -eq 0 ] && \
[ -b /dev/vdb ]; then
sudo umount /dev/vdb
sudo parted /dev/vdb --script -- mklabel msdos
sudo parted /dev/vdb --script -- mkpart primary linux-swap 0 8192
sudo parted /dev/vdb --script -- mkpart primary ext2 8192 -1
sudo mkswap /dev/vdb1
sudo mkfs.ext4 /dev/vdb2
sudo swapon /dev/vdb1
sudo mount /dev/vdb2 /opt
fi
fix_disk_layout
sudo mkdir -p $DEST
sudo chown -R jenkins:jenkins $DEST