Commit 2e3b9a1d authored by David Johnson's avatar David Johnson

Fix a few more minor LVM rename bugs.

parent 67ff1f9d
......@@ -83,13 +83,13 @@ if [ $? -eq 0 -a "$COMPUTE_EXTRA_NOVA_DISK_SPACE" = "1" ]; then
mkfs.ext3 /dev/$VGNAME/nova
fi
mkdir -p /mnt/var-lib-nova
echo "/mnt/var-lib-nova /dev/$VGNAME/nova none defaults,bind 0 0" \
echo "/dev/$VGNAME/nova /mnt/var-lib-nova none defaults,bind 0 0" \
>> /etc/fstab
mount /mnt/var-lib-nova
mount /dev/$VGNAME/nova /mnt/var-lib-nova
chown nova:nova /mnt/var-lib-nova
rsync -avz /var/lib/nova/ /mnt/var-lib-nova/
mount -o bind /mnt/var-lib-nova /var/lib/nova
echo "/var/lib/nova /mnt/var-lib-nova none defaults,bind 0 0" \
echo "/mnt/var-lib-nova /var/lib/nova none defaults,bind 0 0" \
>> /etc/fstab
elif [ -e $ROOTDISK -a "$COMPUTE_EXTRA_NOVA_DISK_SPACE" = "1" ]; then
PART="${ROOTDISK}${ROOTPART}"
......
......@@ -38,11 +38,10 @@ maybe_install_packages xfsprogs rsync
# First try to make LVM volumes; fall back to loop device in /storage. We use
# /storage for swift later, so we make the dir either way.
#
VGNAME="openstack-volumes"
mkdir -p /storage
if [ -z "$LVM" ] ; then
LVM=1
VGNAME="openstack-volumes"
MKEXTRAFS_ARGS="-l -v ${VGNAME} -m util -z 1024"
# On Cloudlab ARM machines, there is no second disk nor extra disk space
# Well, now there's a new partition layout; try it.
......
......@@ -44,6 +44,7 @@ fi
# /storage for swift later, so we make the dir either way.
#
mkdir -p /storage
VGNAME="openstack-volumes"
# Check to see if we already have an `emulab` VG. This would occur
# if the user requested a temp dataset. If this happens, we simple
# rename it to the VG name we expect.
......@@ -54,7 +55,6 @@ if [ $? -eq 0 ]; then
LVM=1
elif [ -z "$LVM" ] ; then
LVM=1
VGNAME="openstack-volumes"
MKEXTRAFS_ARGS="-l -v ${VGNAME} -m util -z 1024"
# On Cloudlab ARM machines, there is no second disk nor extra disk space
# Well, now there's a new partition layout; try it.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment