summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorSzilard Cserey <szilard.cserey@gmail.com>2016-03-24 10:41:17 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-03-24 10:41:17 +0000
commitfb3aa4bec71045a162811a1d2002e582efbad8df (patch)
tree587b246de4631d48280b2ff771ee3cb09deb1012 /ci
parent82c42d839a80bf69b502b8189edd520be1650f78 (diff)
parent0b22305d2944536a8ef3c1b19198e108762698da (diff)
Merge "small fix for deploy.py invocation"
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh15
1 files changed, 9 insertions, 6 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 7bd180ef1..d83bba2f4 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -131,7 +131,9 @@ do
fi
;;
B)
- PXE_BRIDGE="-b ${OPTARG}"
+ if [[ ${OPTARG} ]]; then
+ PXE_BRIDGE="-b ${OPTARG}"
+ fi
;;
d)
DRY_RUN=1
@@ -158,7 +160,9 @@ do
DEPLOY_SCENARIO=${OPTARG}
;;
S)
- STORAGE_DIR="-s ${OPTARG}"
+ if [[ ${OPTARG} ]]; then
+ STORAGE_DIR="-s ${OPTARG}"
+ fi
;;
i)
ISO=${OPTARG}
@@ -170,7 +174,6 @@ do
usage
exit 1
fi
-
;;
h)
usage
@@ -189,8 +192,8 @@ do
done
if [[ $EUID -ne 0 ]]; then
- echo "This script must be run as root" 1>&2
- exit 1
+ echo "This script must be run as root" 1>&2
+ exit 1
fi
if [ -z $BASE_CONFIG_URI ] || [ -z $TARGET_LAB ] || \
@@ -230,7 +233,7 @@ if [ $DRY_RUN -eq 0 ]; then
ISO=${SCRIPT_PATH}/ISO/image.iso
fi
# Start deployment
- echo "python deploy.py -s $STORAGE_DIR -b $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO"
+ echo "python deploy.py $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO"
python deploy.py $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO
fi
popd > /dev/null