openstack/training-labs
Code Issues Proposed changes

Merge "Cosmetics in osbash.sh"

Browse Source
This commit is contained in:
Jenkins
2015-10-11 10:37:34 +00:00
committed by Gerrit Code Review
parent 9214fd38fc c41be3c044
commit 310f4b6487
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
labs/osbash/osbash.sh
View File

@@ -191,7 +191,7 @@ echo -e >&2 "${CStatus:-} $(date) osbash starting ${CReset:-}"
clean_dir "$LOG_DIR"
function cleanup_base_disk {
function check_existing_base_disk {
if [ "$CMD" = basedisk ]; then
if base_disk_exists; then
@@ -207,12 +207,14 @@ function cleanup_base_disk {
fi
}
${OSBASH:-:} cleanup_base_disk
${OSBASH:-:} check_existing_base_disk
#- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if ! base_disk_exists; then
echo -e >&2 "${CStatus:-}Creating basedisk.${CReset:-}"
vm_install_base
else
echo -e >&2 "${CStatus:-}basedisk already exists.${CReset:-}"
# Leave base disk alone, but call the function if wbatch is active
OSBASH= ${WBATCH:-:} vm_install_base
fi