From 6429922e998d3309c0fab08304c9a06311c3f3d4 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 26 Feb 2016 10:04:36 -0800 Subject: [PATCH] Add support to launch-node for cinder attach Now that we have a shade version of the launch node script adding in support for attaching a cinder volume is simple. Do this so that launching mirrors which rely on cinder volumes is simpler. This updates the mount_volume.sh script to setup the first cinder volume with lvm and mount it under the specified path. It will also install lvm2 pacakges since they may not be present on all base images. This updates the make_swap.sh script to avoid blindly using /dev/vdb as the location for swap as this may be a cinder volume or config drive. We add availability zone, device specification, mount path, and fs label support to shade-launch-node.py as these are all necessary inputs to properly mount a cinder volume in a VM. Change-Id: Ie95fd4bd5fca8df4f8046d43d1333935cad567e3 --- launch/launch-node.py | 30 ++++++++++++++++++++++------ make_swap.sh | 4 +++- mount_volume.sh | 46 ++++++++++++++++++++++++++++--------------- 3 files changed, 57 insertions(+), 23 deletions(-) diff --git a/launch/launch-node.py b/launch/launch-node.py index caf5bbc26d..6db6db0f07 100755 --- a/launch/launch-node.py +++ b/launch/launch-node.py @@ -43,7 +43,8 @@ except: pass -def bootstrap_server(server, key, name, volume, keep): +def bootstrap_server(server, key, name, volume_device, keep, + mount_path, fs_label): ip = server.public_v4 ssh_kwargs = dict(pkey=key) @@ -76,10 +77,11 @@ def bootstrap_server(server, key, name, volume, keep): 'make_swap.sh') ssh_client.ssh('bash -x make_swap.sh') - if volume: + if volume_device: ssh_client.scp(os.path.join(SCRIPT_DIR, '..', 'mount_volume.sh'), 'mount_volume.sh') - ssh_client.ssh('bash -x mount_volume.sh') + ssh_client.ssh('bash -x mount_volume.sh %s %s %s' % + (volume_device, mount_path, fs_label)) # This next chunk should really exist as a playbook, but whatev ssh_client.scp(os.path.join(SCRIPT_DIR, '..', 'install_puppet.sh'), @@ -133,7 +135,8 @@ def bootstrap_server(server, key, name, volume, keep): def build_server(cloud, name, image, flavor, - volume, keep, network, boot_from_volume, config_drive): + volume, keep, network, boot_from_volume, config_drive, + mount_path, fs_label, availability_zone): key = None server = None @@ -143,6 +146,9 @@ def build_server(cloud, name, image, flavor, network=network, config_drive=config_drive) + if availability_zone: + create_kwargs['availability_zone'] = availability_zone + if volume: create_kwargs['volumes'] = [volume] @@ -166,7 +172,9 @@ def build_server(cloud, name, image, flavor, cloud.delete_keypair(key_name) server = cloud.get_openstack_vars(server) - bootstrap_server(server, key, name, volume, keep) + volume_device = cloud.get_volume_attach_device(volume, server['id']) + bootstrap_server(server, key, name, volume_device, keep, + mount_path, fs_label) print('UUID=%s\nIPV4=%s\nIPV6=%s\n' % ( server.id, server.public_v4, server.public_v6)) except Exception: @@ -199,6 +207,12 @@ def main(): parser.add_argument("--volume", dest="volume", help="UUID of volume to attach to the new server.", default=None) + parser.add_argument("--mount-path", dest="mount_path", + help="Path to mount cinder volume at.", + default=None) + parser.add_argument("--fs-label", dest="fs_label", + help="FS label to use when mounting cinder volume.", + default=None) parser.add_argument("--boot-from-volume", dest="boot_from_volume", help="Create a boot volume for the server and use it.", action='store_true', @@ -216,6 +230,8 @@ def main(): help="Boot with config_drive attached.", action='store_true', default=True) + parser.add_argument("--az", dest="availability_zone", default=None, + help="AZ to boot in.") options = parser.parse_args() shade.simple_logging(debug=options.verbose) @@ -249,7 +265,9 @@ def main(): server = build_server(cloud, options.name, image, flavor, options.volume, options.keep, options.network, options.boot_from_volume, - options.config_drive) + options.config_drive, + options.mount_path, options.fs_label, + options.availability_zone) dns.print_dns(cloud, server) # Zero the ansible inventory cache so that next run finds the new server diff --git a/make_swap.sh b/make_swap.sh index 33830a977b..b03be7c67f 100644 --- a/make_swap.sh +++ b/make_swap.sh @@ -21,7 +21,9 @@ if [ `grep SwapTotal /proc/meminfo | awk '{ print $2; }'` -eq 0 ]; then elif [ -b /dev/xvde ]; then DEV='/dev/xvde' fi - if [ -n "$DEV" ]; then + + # Avoid using config drive device for swap + if [ -n "$DEV" ] && ! blkid | grep $DEV ; then MEMKB=`grep MemTotal /proc/meminfo | awk '{print $2; }'` # Use the nearest power of two in MB as the swap size. # This ensures that the partitions below are aligned properly. diff --git a/mount_volume.sh b/mount_volume.sh index 8ac296284a..74db995cd2 100644 --- a/mount_volume.sh +++ b/mount_volume.sh @@ -14,23 +14,37 @@ # License for the specific language governing permissions and limitations # under the License. -# Sigh. nova volume-attach is not immediate, but there is no status to track -sleep 120 +DEVICE=$1 +MOUNT_PATH=$2 +FS_LABEL=$3 -if [ -b /dev/vdc ]; then - DEV='/dev/vdc' -elif [ -b /dev/xvdb ]; then - DEV='/dev/xvdb' +# Because images may not have all the things we need. +if which apt-get ; then + apt-get update && apt-get install -y lvm2 +elif which yum ; then + yum -y install lvm2 +fi + +# Sanity check that we don't break anything that already has an fs. +if ! blkid | grep $DEVICE ; then + set -e + parted --script $DEVICE mklabel msdos mkpart primary 0% 100% set 1 lvm on + partprobe -s $DEVICE + pvcreate ${DEVICE}1 + vgcreate main ${DEVICE}1 + lvcreate -l 100%FREE -n $FS_LABEL main + mkfs.ext4 -m 0 -j -L $FS_LABEL /dev/main/$FS_LABEL + tune2fs -i 0 -c 0 /dev/main/$FS_LABEL + + # Remove existing fstab entries for this device. + perl -nle "m,/dev/main/$FS_LABEL, || print" -i /etc/fstab + + if [ ! -d $MOUNT_PATH ] ; then + mkdir -p $MOUNT_PATH + fi + + echo "/dev/main/$FS_LABEL $MOUNT_PATH ext4 errors=remount-ro,barrier=0 0 2" >> /etc/fstab + mount -a else - echo "Could not mount volume" exit 1 fi -if ! blkid | grep $DEV | grep ext4 ; then - mkfs.ext4 ${DEV} -fi -perl -nle "m,${DEV}, || print" -i /etc/fstab -if [ ! -d /srv ] ; then - mkdir -p /srv -fi -echo "${DEV} /srv ext4 errors=remount-ro,barrier=0 0 2" >> /etc/fstab -mount -a