diff options
| author |   Szilard Cserey <szilard.cserey@gmail.com> | 2016-03-11 09:49:05 +0100 |
|---|---|---|
| committer | Szilard Cserey <szilard.cserey@gmail.com> | 2016-03-11 23:53:19 +0100 |
| commit | 0b22305d2944536a8ef3c1b19198e108762698da (patch) | |
| tree | c4ee733d5496fe72ae5da3a250d603ca427d9d39 /ci | |
| parent | 40b59c1ebe8723d5b52ef548a9c22b80d49cbc5a (diff) | |
small fix for deploy.py invocation
Change-Id: I8587500c71f05ca69645422ae110651196e0cad2
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 15 |
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 |