X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=8411714ebc0bf8d15b1a2584464419637965fb56;hb=refs%2Fchanges%2F37%2F29937%2F2;hp=d1f411fa505829d27ab3a8dff87247f4b658d250;hpb=7fd2619e0df370fa832eeff00790bcaa52dc4ffc;p=fuel.git

diff --git a/ci/deploy.sh b/ci/deploy.sh
index d1f411fa5..8411714eb 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 ##############################################################################
 # Copyright (c) 2015 Ericsson AB and others.
 # jonas.bjurel@ericsson.com
@@ -28,15 +29,25 @@ cat << EOF
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 `basename $0`: Deploys the Fuel@OPNFV stack
 
-usage: `basename $0` -b base-uri -l lab-name -p pod-name -i iso
+usage: `basename $0` -b base-uri [-B PXE Bridge] [-f] [-F] [-H] -l lab-name -p pod-name -s deploy-scenario [-S image-dir] [-T timeout] -i iso
        -s deployment-scenario [-S optional Deploy-scenario path URI]
        [-R optional local relen repo (containing deployment Scenarios]
 
 OPTIONS:
   -b  Base-uri for the stack-configuration structure
+  -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  Print this message and exit
+  -H  No health check
   -l  Lab-name
+  -L  Deployment log path and file name
   -p  Pod-name
   -s  Deploy-scenario short-name/base-file-name
+  -S  Storage dir for VM images
+  -T  Timeout, in minutes, for the deploy.
   -i  iso url
 
 Description:
@@ -48,18 +59,34 @@ and provides a fairly simple mechanism to execute a deployment.
 Input parameters to the build script is:
 -b Base URI to the configuration directory (needs to be provided in a URI
    style, it can be a local resource: file:// or a remote resource http(s)://)
+-B PXE Bridge for booting of Fuel master. It can be specified several times,
+   or as a comma separated list of bridges, or both: -B br1 -B br2,br3
+   One NIC connected to each specified bridge will be created in the Fuel VM,
+   in the same order as provided in the command line. The default is pxebr.
+-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 Print this message and exit
+-H Do not run fuel built in health-check after successfull deployment
 -l Lab name as defined in the configuration directory, e.g. lf
+-L Deployment log path and name, eg. -L /home/jenkins/logs/job888.log.tar.gz
 -p POD name as defined in the configuration directory, e.g. pod-1
 -s Deployment-scenario, this points to a deployment/test scenario file as
    defined in the configuration directory:
    e.g fuel-ocl-heat-ceilometer_scenario_0.0.1.yaml
    or a deployment short-name as defined by scenario.yaml in the deployment
    scenario path.
+-S Storage dir for VM images, default is fuel/deploy/images
+-T Timeout, in minutes, for the deploy. It defaults to using the DEPLOY_TIMEOUT
+   environment variable when defined, or to the default in deploy.py otherwise
 -i .iso image to be deployed (needs to be provided in a URI
    style, it can be a local resource: file:// or a remote resource http(s)://)
 
 NOTE: Root priviledges are needed for this script to run
 
+
 Examples:
 sudo `basename $0` -b file:///home/jenkins/lab-config -l lf -p pod1 -s ha_odl-l3_heat_ceilometer -i file:///home/jenkins/myiso.iso
 EOF
@@ -74,9 +101,7 @@ EOF
 #
 clean() {
     echo "Cleaning up deploy tmp directories"
-    rm -rf ${SCRIPT_PATH}/config
     rm -rf ${SCRIPT_PATH}/ISO
-    rm -rf ${SCRIPT_PATH}/releng
 }
 #
 # END of deployment clean-up
@@ -87,7 +112,18 @@ clean() {
 #
 SCRIPT_PATH=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 DEPLOY_DIR=$(cd ${SCRIPT_PATH}/../deploy; pwd)
-RELENG_REPO=https://jonasbjurel@gerrit.opnfv.org/gerrit/releng
+PXE_BRIDGE=''
+NO_HEALTH_CHECK=''
+USE_EXISTING_FUEL=''
+FUEL_CREATION_ONLY=''
+NO_DEPLOY_ENVIRONMENT=''
+STORAGE_DIR=''
+DRY_RUN=0
+if ! [ -z $DEPLOY_TIMEOUT ]; then
+    DEPLOY_TIMEOUT="-dt $DEPLOY_TIMEOUT"
+else
+    DEPLOY_TIMEOUT=""
+fi
 #
 # END of variables to customize
 ############################################################################
@@ -95,23 +131,70 @@ RELENG_REPO=https://jonasbjurel@gerrit.opnfv.org/gerrit/releng
 ############################################################################
 # BEGIN of main
 #
-while getopts "b:l:p:s:i:h" OPTION
+while getopts "b:B:dfFHl:L:p:s:S:T:i:he" OPTION
 do
     case $OPTION in
         b)
             BASE_CONFIG_URI=${OPTARG}
+            if [[ ! $BASE_CONFIG_URI == file://* ]] && \
+               [[ ! $BASE_CONFIG_URI == http://* ]] && \
+               [[ ! $BASE_CONFIG_URI == https://* ]] && \
+               [[ ! $BASE_CONFIG_URI == ftp://* ]]; then
+                echo "-b $BASE_CONFIG_URI - Not given in URI style"
+                usage
+                exit 1
+            fi
+            ;;
+        B)
+            for bridge in ${OPTARG//,/ }; do
+                PXE_BRIDGE+=" -b $bridge"
+            done
+            ;;
+        d)
+            DRY_RUN=1
+            ;;
+        f)
+            USE_EXISTING_FUEL='-nf'
+            ;;
+        F)
+            FUEL_CREATION_ONLY='-fo'
+            ;;
+        e)
+            NO_DEPLOY_ENVIRONMENT='-nde'
+            ;;
+        H)
+            NO_HEALTH_CHECK='-nh'
             ;;
         l)
             TARGET_LAB=${OPTARG}
             ;;
+        L)
+            DEPLOY_LOG="-log ${OPTARG}"
+            ;;
         p)
             TARGET_POD=${OPTARG}
             ;;
         s)
             DEPLOY_SCENARIO=${OPTARG}
             ;;
+        S)
+            if [[ ${OPTARG} ]]; then
+                STORAGE_DIR="-s ${OPTARG}"
+            fi
+            ;;
+        T)
+            DEPLOY_TIMEOUT="-dt ${OPTARG}"
+            ;;
         i)
             ISO=${OPTARG}
+            if [[ ! $ISO == file://* ]] && \
+               [[ ! $ISO == http://* ]] && \
+               [[ ! $ISO == https://* ]] && \
+               [[ ! $ISO == ftp://* ]]; then
+                echo "-i $ISO - Not given in URI style"
+                usage
+                exit 1
+            fi
             ;;
         h)
             usage
@@ -130,8 +213,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 ] || \
@@ -146,35 +229,36 @@ if [ -z $BASE_CONFIG_URI ] || [ -z $TARGET_LAB ] || \
 fi
 
 # Enable the automatic exit trap
-set -o errexit
 trap do_exit SIGINT SIGTERM EXIT
 
+# Set no restrictive umask so that Jenkins can removeeee any residuals
+umask 0000
+
 clean
 
 pushd ${DEPLOY_DIR} > /dev/null
 # Prepare the deploy config files based on lab/pod information, deployment
 # scenario, etc.
 
-echo "python deploy-config.py -dha ${BASE_CONFIG_URI}/labs/${TARGET_LAB}/${TARGET_POD}/fuel/config/dha.yaml -deab ${DEPLOY_DIR}/config/dea_base.yaml -deao ${BASE_CONFIG_URI}/labs/${TARGET_LAB}/${TARGET_POD}/fuel/config/dea-pod-override.yaml -scenario-base-uri ${DEPLOY_DIR}/scenario -scenario ${DEPLOY_SCENARIO} -plugins ${DEPLOY_DIR}/config/plugins -output ${SCRIPT_PATH}/config"
+echo "python deploy-config.py -dha ${BASE_CONFIG_URI}/labs/${TARGET_LAB}/${TARGET_POD}/fuel/config/dha.yaml -deab file://${DEPLOY_DIR}/config/dea_base.yaml -deao ${BASE_CONFIG_URI}/labs/${TARGET_LAB}/${TARGET_POD}/fuel/config/dea-pod-override.yaml -scenario-base-uri file://${DEPLOY_DIR}/scenario -scenario ${DEPLOY_SCENARIO} -plugins file://${DEPLOY_DIR}/config/plugins -output ${SCRIPT_PATH}/config"
 
 python deploy-config.py -dha ${BASE_CONFIG_URI}/labs/${TARGET_LAB}/${TARGET_POD}/fuel/config/dha.yaml -deab file://${DEPLOY_DIR}/config/dea_base.yaml -deao ${BASE_CONFIG_URI}/labs/${TARGET_LAB}/${TARGET_POD}/fuel/config/dea-pod-override.yaml -scenario-base-uri file://${DEPLOY_DIR}/scenario -scenario ${DEPLOY_SCENARIO} -plugins file://${DEPLOY_DIR}/config/plugins -output ${SCRIPT_PATH}/config
 
-# Download iso if it doesn't already exists locally
-if [[ $ISO == file://* ]]; then
-    ISO=${ISO#file://}
-else
-    mkdir -p ${SCRIPT_PATH}/ISO
-    curl -o ${SCRIPT_PATH}/ISO/image.iso $ISO
-    ISO=${SCRIPT_PATH}/ISO/image.iso
+if [ $DRY_RUN -eq 0 ]; then
+    # Download iso if it doesn't already exists locally
+    if [[ $ISO == file://* ]]; then
+        ISO=${ISO#file://}
+    else
+        mkdir -p ${SCRIPT_PATH}/ISO
+        curl -o ${SCRIPT_PATH}/ISO/image.iso $ISO
+        ISO=${SCRIPT_PATH}/ISO/image.iso
+    fi
+    # Start deployment
+    echo "python deploy.py $DEPLOY_LOG $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 $DEPLOY_TIMEOUT"
+    python deploy.py $DEPLOY_LOG $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 $DEPLOY_TIMEOUT
 fi
-# Start deployment
-echo "python deploy.py -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO"
-python deploy.py -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO
 popd > /dev/null
 
-# TBD: Upload the test-section of the scenario yaml file to the fuel master:
-# var/www/test.yaml
-
 #
 # END of main
 ############################################################################