From 0638d539fb3a9709732f62dc8ff880eedf9078eb Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Mon, 7 Mar 2016 13:31:16 +0100 Subject: Add no_deploy_environment option For development reason it is useable to have an option so that everything is done except the deploy of the openstack environment. Change-Id: I1f1b7f9c89ee8c9ceea96353e25a51eee53b955c Conflicts: deploy/cloud/deploy.py deploy/deploy.py deploy/deploy_env.py --- ci/deploy.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'ci') diff --git a/ci/deploy.sh b/ci/deploy.sh index 2304d7296..7bd180ef1 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -38,6 +38,7 @@ OPTIONS: -B PXE Bridge for booting of Fuel master -d Dry-run -f Deploy on existing Fuel master + -e Do not launch environment deployment -F Do only create a Fuel master -H No health check -l Lab-name @@ -59,6 +60,7 @@ Input parameters to the build script is: -d Dry-run - Produces deploy config files (config/dea.yaml and config/dha.yaml), but does not execute deploy -f Deploy on existing Fuel master +-e Do not launch environment deployment -F Do only create a Fuel master -H Do not run fuel built in health-check after successfull deployment -l Lab name as defined in the configuration directory, e.g. lf @@ -104,6 +106,7 @@ PXE_BRIDGE='' NO_HEALTH_CHECK='' USE_EXISTING_FUEL='' FUEL_CREATION_ONLY='' +NO_DEPLOY_ENVIRONMENT='' STORAGE_DIR='' DRY_RUN=0 # @@ -113,7 +116,7 @@ DRY_RUN=0 ############################################################################ # BEGIN of main # -while getopts "b:B:dfFHl:p:s:S:i:h" OPTION +while getopts "b:B:dfFHl:p:s:S:i:h:e" OPTION do case $OPTION in b) @@ -139,6 +142,9 @@ do F) FUEL_CREATION_ONLY='-fo' ;; + e) + NO_DEPLOY_ENVIRONMENT='-nde' + ;; H) NO_HEALTH_CHECK='-nh' ;; @@ -224,8 +230,8 @@ 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 -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 -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO + 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" + 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 -- cgit 1.2.3-korg