summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-08-27 23:37:49 -0400
committerZhijiang Hu <hu.zhijiang@zte.com.cn>2017-08-28 04:34:30 -0400
commit85856375b27a98d9173d845ab509a16b6f4705fb (patch)
treecaac2be10e774d2509f5338e0568ed8176c540d0 /ci
parentf3ad3936a5d395ecb31849835e6517bdc5de8d59 (diff)
Introduce deployment error recovery level
Change-Id: I023a637e793bae845feabed0d7b80072d3f9f0b7 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy/deploy.sh18
1 files changed, 12 insertions, 6 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 056f6b41..a104230d 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -32,6 +32,7 @@ OPTIONS:
-w Workdir for temporary usage, optional
-h Print this message and exit
-s Deployment scenario
+ -S Skip recreate Daisy VM during deployment
Description:
Deploys the Daisy4NFV on the indicated lab resource
@@ -62,6 +63,7 @@ POD_NAME=''
TARGET_HOSTS_NUM=0
DRY_RUN=0
IS_BARE=1
+SKIP_DEPLOY_DAISY=0
VM_MULTINODE=("computer01" "computer02" "controller02" "controller03" "controller01")
VALID_DEPLOY_SCENARIO=("os-nosdn-nofeature-noha" "os-nosdn-nofeature-ha" "os-odl_l3-nofeature-noha"
"os-odl_l2-nofeature-noha" "os-odl_l3-nofeature-ha" "os-odl_l2-nofeature-ha"
@@ -74,7 +76,7 @@ VALID_DEPLOY_SCENARIO=("os-nosdn-nofeature-noha" "os-nosdn-nofeature-ha" "os-odl
############################################################################
# BEGIN of main
#
-while getopts "b:B:Dd:n:l:p:r:w:s:h" OPTION
+while getopts "b:B:Dd:n:l:p:r:w:s:Sh" OPTION
do
case $OPTION in
b)
@@ -104,6 +106,9 @@ do
s)
DEPLOY_SCENARIO=${OPTARG}
;;
+ S)
+ SKIP_DEPLOY_DAISY=1
+ ;;
h)
usage
exit 0
@@ -427,11 +432,12 @@ function config_daisy()
clean_up_target_vms_and_networks
-#TODO: These steps shall be done only for the first time
-clean_up_daisy_vm_and_networks
-create_daisy_vm_and_networks
-install_daisy
-config_daisy
+if [ ! $SKIP_DEPLOY_DAISY -eq 1 ]; then
+ clean_up_daisy_vm_and_networks
+ create_daisy_vm_and_networks
+ install_daisy
+ config_daisy
+fi
echo "====== prepare cluster and pxe ======"