diff --git a/AUTHORS b/AUTHORS index def453d122..073315fc04 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,6 +10,7 @@ Devin Carlen Eddie Hebert Eoghan Glynn Gabriel Hurley +Hengqing Hu Jake Dahn James E. Blair Jason Cannavale diff --git a/tools/build_uec.sh b/tools/build_uec.sh index ed5a017174..35a4d6dbba 100755 --- a/tools/build_uec.sh +++ b/tools/build_uec.sh @@ -147,7 +147,7 @@ cat > $LIBVIRT_XML < - + diff --git a/tools/jenkins/jenkins_home/jobs/diablo-xs_ha/config.xml b/tools/jenkins/jenkins_home/jobs/diablo-xs_ha/config.xml index d0fa6af3f9..49a57f0407 100644 --- a/tools/jenkins/jenkins_home/jobs/diablo-xs_ha/config.xml +++ b/tools/jenkins/jenkins_home/jobs/diablo-xs_ha/config.xml @@ -78,7 +78,7 @@ set -o xtrace . localrc # Unlike kvm, ssh to the xen host to run tests, in case the test instance is launch with a host only network -ssh root@$XEN_IP "cd devstack && . localrc && cd tools/jenkins && ./run_test.sh $EXECUTOR_NUMBER $ADAPTER '$RC'" +ssh root@$XEN_IP "cd devstack && . localrc && cd tools/jenkins && ./run_test.sh $EXECUTOR_NUMBER $ADAPTER '$RC'" diff --git a/tools/rfc.sh b/tools/rfc.sh index 0bc1531951..d4dc597454 100755 --- a/tools/rfc.sh +++ b/tools/rfc.sh @@ -1,5 +1,5 @@ #!/bin/sh -e -# Copyright (c) 2010-2011 Gluster, Inc. +# Copyright (c) 2010-2011 Gluster, Inc. # This initial version of this file was taken from the source tree # of GlusterFS. It was not directly attributed, but is assumed to be # Copyright (c) 2010-2011 Gluster, Inc and release GPLv3 diff --git a/tools/warm_apts_and_pips_for_uec.sh b/tools/warm_apts_and_pips_for_uec.sh index ec7e916c24..23a28decec 100755 --- a/tools/warm_apts_and_pips_for_uec.sh +++ b/tools/warm_apts_and_pips_for_uec.sh @@ -30,7 +30,7 @@ fi if [ ! -d files/apts ]; then echo "Please run this script from devstack/tools/" exit 1 -fi +fi # Mount the image STAGING_DIR=/tmp/`echo $1 | sed "s/\//_/g"`.stage diff --git a/tools/xen/build_domU.sh b/tools/xen/build_domU.sh index cf043bf8d1..046279656b 100755 --- a/tools/xen/build_domU.sh +++ b/tools/xen/build_domU.sh @@ -144,7 +144,7 @@ if [ ! -d $TOP_DIR/nova ]; then env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO cd $TOP_DIR/nova git checkout $NOVA_BRANCH -fi +fi # Install plugins cp -pr $TOP_DIR/nova/plugins/xenserver/xenapi/etc/xapi.d /etc/ diff --git a/tools/xen/prepare_dom0.sh b/tools/xen/prepare_dom0.sh index b94a4218a2..49988bd605 100755 --- a/tools/xen/prepare_dom0.sh +++ b/tools/xen/prepare_dom0.sh @@ -21,7 +21,7 @@ if [ -e /usr/bin/vim ]; then ln -s /usr/bin/vim /bin/vi fi -# Install git +# Install git if ! which git; then DEST=/tmp/ GITDIR=$DEST/git-1.7.7 diff --git a/tools/xen/scripts/install-os-vpx.sh b/tools/xen/scripts/install-os-vpx.sh index f0dc3c2d75..d45c37021e 100755 --- a/tools/xen/scripts/install-os-vpx.sh +++ b/tools/xen/scripts/install-os-vpx.sh @@ -88,7 +88,7 @@ EOF get_params() { - while getopts "hicwbf:d:v:m:p:k:r:l:" OPTION; + while getopts "hicwbf:d:v:m:p:k:r:l:" OPTION; do case $OPTION in h) usage @@ -246,7 +246,7 @@ create_management_vif() # This installs the interface for public traffic, only if a bridge is specified -# The interface is not configured at this stage, but it will be, once the admin +# The interface is not configured at this stage, but it will be, once the admin # tasks are complete for the services of this VPX create_public_vif() { diff --git a/tools/xen/scripts/mkxva b/tools/xen/scripts/mkxva index dcdee61ac2..a316da2ddb 100755 --- a/tools/xen/scripts/mkxva +++ b/tools/xen/scripts/mkxva @@ -177,7 +177,7 @@ EOF /sbin/mkfs.ext3 -I 128 -m0 -F "$partition" /sbin/e2label "$partition" vpxroot make_fs_inner "$staging" "$partition" "" - + # Now run grub on the image we've created CLEAN_MOUNTPOINT=$(mktemp -d "$TMPDIR/mkfs-XXXXXX") @@ -203,7 +203,7 @@ EOF $SUDO umount "$CLEAN_MOUNTPOINT" CLEAN_MOUNTPOINT= - + # Grub expects a disk with name /dev/xxxx with a first partition # named /dev/xxxx1, so we give it what it wants using symlinks # Note: /dev is linked to the real /dev of the build machine, so @@ -214,14 +214,14 @@ EOF rm -f "$disk_part1_name" ln -s "$CLEAN_LOSETUP" "$disk_name" ln -s "$partition" "$disk_part1_name" - + # Feed commands into the grub shell to setup the disk grub --no-curses --device-map=/dev/null </dev/null @@ -359,7 +359,7 @@ done # cleanup -if [ -z "${DO_NOT_CLEANUP:-}" ] ; then +if [ -z "${DO_NOT_CLEANUP:-}" ] ; then rm -rf "$XVA_TARBALL_STAGING" rm -f "$FS_TMPFILE" fi