From b46a635c7531ba8a71663791e3f51ed8a44cb13f Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 7 Oct 2015 10:51:44 -0700 Subject: [PATCH] Revert "create partition for lvm volume" This reverts commit 034189ec041aca5740c1689f3034f9b2e9d4418e. This change was made with the justification that it would make cinder use "a bit more optimized" and that it "may impact reliability for good". There was a link in a review comment to a bug that did not appear to have any relevance. In short, this change added both complexity and essentially a test environment requirement for a second volume. Perhaps we need that, but if we are going to establish that as a requirement, we should have some evidence to back up the performance claims. Change-Id: I541a66d81fab5be65bb9cd6684e00aa85c3283a9 --- functions.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/functions.sh b/functions.sh index 78b27fc5..29bc7430 100644 --- a/functions.sh +++ b/functions.sh @@ -301,16 +301,14 @@ function fix_disk_layout { fi sudo parted ${DEV} --script -- mklabel msdos sudo parted ${DEV} --script -- mkpart primary linux-swap 1 8192 - sudo parted ${DEV} --script -- mkpart primary ext2 8192 32768 - sudo parted ${DEV} --script -- mkpart primary ext2 32768 -1 - sudo mkswap $swap - sudo vgcreate stack-volumes-lvmdriver-1 $lvmvol - sudo mkfs.ext4 $optdev - sudo swapon $swap - sudo mount $optdev /mnt + sudo parted ${DEV} --script -- mkpart primary ext2 8192 -1 + sudo mkswap ${DEV}1 + sudo mkfs.ext4 ${DEV}2 + sudo swapon ${DEV}1 + sudo mount ${DEV}2 /mnt sudo find /opt/ -mindepth 1 -maxdepth 1 -exec mv {} /mnt/ \; sudo umount /mnt - sudo mount $optdev /opt + sudo mount ${DEV}2 /opt fi fi