openstack/devstack
Code Issues Proposed changes

clean up whitespace on stack.sh

Browse Source 
Change-Id: If73435968cfbd0dd3cc519f0a30e02bec5fcb386
This commit is contained in:
Sean Dague 2013-10-22 10:08:04 -04:00
parent 922c8ae680
commit b83c365cf5
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
stack.sh
View File

@ -1018,7 +1018,7 @@ if is_service_enabled nova && is_baremetal; then
prepare_baremetal_toolchain prepare_baremetal_toolchain
configure_baremetal_nova_dirs configure_baremetal_nova_dirs
if [[ "$BM_USE_FAKE_ENV" = "True" ]]; then if [[ "$BM_USE_FAKE_ENV" = "True" ]]; then
create_fake_baremetal_env create_fake_baremetal_env
fi fi
fi fi
@ -1180,26 +1180,26 @@ if is_service_enabled g-reg; then
die_if_not_set $LINENO TOKEN "Keystone fail to get token" die_if_not_set $LINENO TOKEN "Keystone fail to get token"
if is_baremetal; then 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 # build and upload separate deploy kernel & ramdisk
upload_baremetal_deploy $TOKEN upload_baremetal_deploy $TOKEN
# upload images, separating out the kernel & ramdisk for PXE boot # upload images, separating out the kernel & ramdisk for PXE boot
for image_url in ${IMAGE_URLS//,/ }; do for image_url in ${IMAGE_URLS//,/ }; do
upload_baremetal_image $image_url $TOKEN upload_baremetal_image $image_url $TOKEN
done done
else else
echo_summary "Uploading images" echo_summary "Uploading images"
# Option to upload legacy ami-tty, which works with xenserver # Option to upload legacy ami-tty, which works with xenserver
if [[ -n "$UPLOAD_LEGACY_TTY" ]]; then if [[ -n "$UPLOAD_LEGACY_TTY" ]]; then
IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}https://github.com/downloads/citrix-openstack/warehouse/tty.tgz" IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}https://github.com/downloads/citrix-openstack/warehouse/tty.tgz"
fi fi
for image_url in ${IMAGE_URLS//,/ }; do for image_url in ${IMAGE_URLS//,/ }; do
upload_image $image_url $TOKEN upload_image $image_url $TOKEN
done done
fi fi
fi fi
@ -1211,7 +1211,7 @@ fi
if is_service_enabled nova && is_baremetal; then if is_service_enabled nova && is_baremetal; then
# create special flavor for baremetal if we know what images to associate # create special flavor for baremetal if we know what images to associate
[[ -n "$BM_DEPLOY_KERNEL_ID" ]] && [[ -n "$BM_DEPLOY_RAMDISK_ID" ]] && \ [[ -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 # otherwise user can manually add it later by calling nova-baremetal-manage
[[ -n "$BM_FIRST_MAC" ]] && add_baremetal_node [[ -n "$BM_FIRST_MAC" ]] && add_baremetal_node
@ -1233,7 +1233,7 @@ fi
CURRENT_RUN_TIME=$(date "+$TIMESTAMP_FORMAT") CURRENT_RUN_TIME=$(date "+$TIMESTAMP_FORMAT")
echo "# $CURRENT_RUN_TIME" >$TOP_DIR/.stackenv echo "# $CURRENT_RUN_TIME" >$TOP_DIR/.stackenv
for i in BASE_SQL_CONN ENABLED_SERVICES HOST_IP LOGFILE \ 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 echo $i=${!i} >>$TOP_DIR/.stackenv
done done