From b83c365cf540261c9455a41f4f96aa3c0695fa9c Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 22 Oct 2013 10:08:04 -0400 Subject: [PATCH] clean up whitespace on stack.sh Change-Id: If73435968cfbd0dd3cc519f0a30e02bec5fcb386 --- stack.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/stack.sh b/stack.sh index f54d0f240b..5813a8ad09 100755 --- a/stack.sh +++ b/stack.sh @@ -1018,7 +1018,7 @@ if is_service_enabled nova && is_baremetal; then prepare_baremetal_toolchain configure_baremetal_nova_dirs if [[ "$BM_USE_FAKE_ENV" = "True" ]]; then - create_fake_baremetal_env + create_fake_baremetal_env fi fi @@ -1180,26 +1180,26 @@ if is_service_enabled g-reg; then die_if_not_set $LINENO TOKEN "Keystone fail to get token" if is_baremetal; then - echo_summary "Creating and uploading baremetal images" + echo_summary "Creating and uploading baremetal images" - # build and upload separate deploy kernel & ramdisk - upload_baremetal_deploy $TOKEN + # build and upload separate deploy kernel & ramdisk + upload_baremetal_deploy $TOKEN - # upload images, separating out the kernel & ramdisk for PXE boot - for image_url in ${IMAGE_URLS//,/ }; do - upload_baremetal_image $image_url $TOKEN - done + # upload images, separating out the kernel & ramdisk for PXE boot + for image_url in ${IMAGE_URLS//,/ }; do + upload_baremetal_image $image_url $TOKEN + done else - echo_summary "Uploading images" + echo_summary "Uploading images" - # Option to upload legacy ami-tty, which works with xenserver - if [[ -n "$UPLOAD_LEGACY_TTY" ]]; then - IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}https://github.com/downloads/citrix-openstack/warehouse/tty.tgz" - fi + # Option to upload legacy ami-tty, which works with xenserver + if [[ -n "$UPLOAD_LEGACY_TTY" ]]; then + IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}https://github.com/downloads/citrix-openstack/warehouse/tty.tgz" + fi - for image_url in ${IMAGE_URLS//,/ }; do - upload_image $image_url $TOKEN - done + for image_url in ${IMAGE_URLS//,/ }; do + upload_image $image_url $TOKEN + done fi fi @@ -1211,7 +1211,7 @@ fi if is_service_enabled nova && is_baremetal; then # create special flavor for baremetal if we know what images to associate [[ -n "$BM_DEPLOY_KERNEL_ID" ]] && [[ -n "$BM_DEPLOY_RAMDISK_ID" ]] && \ - create_baremetal_flavor $BM_DEPLOY_KERNEL_ID $BM_DEPLOY_RAMDISK_ID + create_baremetal_flavor $BM_DEPLOY_KERNEL_ID $BM_DEPLOY_RAMDISK_ID # otherwise user can manually add it later by calling nova-baremetal-manage [[ -n "$BM_FIRST_MAC" ]] && add_baremetal_node @@ -1233,7 +1233,7 @@ fi CURRENT_RUN_TIME=$(date "+$TIMESTAMP_FORMAT") echo "# $CURRENT_RUN_TIME" >$TOP_DIR/.stackenv for i in BASE_SQL_CONN ENABLED_SERVICES HOST_IP LOGFILE \ - SERVICE_HOST SERVICE_PROTOCOL STACK_USER TLS_IP; do + SERVICE_HOST SERVICE_PROTOCOL STACK_USER TLS_IP; do echo $i=${!i} >>$TOP_DIR/.stackenv done