openstack/training-guides
Code Issues Proposed changes

Merge "labs: osbash CLI default changes"

Browse Source
This commit is contained in:
Jenkins 2014-08-14 14:20:59 +00:00 committed by Gerrit Code Review
commit 9cd30d9c9f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
labs/osbash.sh
View File

@ -109,21 +109,24 @@ echo >&2 "$(date) osbash starting"
clean_dir "$LOG_DIR"
function cleanup_base_disk {
# Remove users of base disk
echo >&2 "Unregistering and removing all disks attached to base disk path"
disk_delete_child_vms "$BASE_DISK"
if [ -f "$BASE_DISK" ]; then
if [ "$CMD" = basedisk -a -f "$BASE_DISK" ]; then
echo >&2 "Found existing base disk: $BASE_DISK"
if ! yes_or_no "Re-use this base disk?"; then
if ! yes_or_no "Keep this base disk?"; then
if disk_registered "$BASE_DISK"; then
echo >&2 "Unregistering old base disk"
# Remove users of base disk
echo >&2 "Unregistering and removing all disks attached to" \
"base disk path."
disk_delete_child_vms "$BASE_DISK"
echo >&2 "Unregistering old base disk."
disk_unregister "$BASE_DISK"
fi
echo >&2 "Removing old base disk"
echo >&2 "Removing old base disk."
rm -f "$BASE_DISK"
else
echo >&2 "Nothing to do. Exiting."
exit
fi
fi
}
@ -142,6 +145,8 @@ if [ "$CMD" = basedisk ]; then
exit
fi
echo "Using base disk $BASE_DISK"
${WBATCH:-:} wbatch_create_hostnet
MGMT_NET_IF=$(create_network "$MGMT_NET")
DATA_NET_IF=$(create_network "$DATA_NET")