diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2018-01-19 07:11:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-19 07:11:56 +0000 |
| commit | 758c219ff3c371dd2e1c07ca7cd0e4c62d9f4c87 (patch) | |
| tree | c6a6834e950ef77f9e4fa48658e774059e2192e9 /ci/deploy/deploy.sh | |
| parent | ac4b6676ca9b27705ed39e35039f0d3403695cb6 (diff) | |
| parent | 371916c2ad016c460cee384db0e9ca1c97d11b6f (diff) | |
Merge "Add extra parameter to integrate with doctor"
Diffstat (limited to 'ci/deploy/deploy.sh')
| -rwxr-xr-x | ci/deploy/deploy.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 8fbc172f..c308ae25 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -74,7 +74,7 @@ VALID_DEPLOY_SCENARIO=("os-nosdn-nofeature-noha" "os-nosdn-nofeature-ha" "os-odl ############################################################################ # BEGIN of main # -while getopts "b:B:Dn:L:l:p:r:w:s:Sh" OPTION +while getopts "b:B:Dn:L:l:p:r:w:s:d:Sh" OPTION do case $OPTION in b) @@ -107,6 +107,9 @@ do S) SKIP_DEPLOY_DAISY=1 ;; + d) + RUN_DOCTOR=${OPTARG} + ;; h) usage exit 0 @@ -134,6 +137,8 @@ fi DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature-noha"} +RUN_DOCTOR=${RUN_DOCTOR:-"0"} + BRIDGE=${BRIDGE:-pxebr} # these two config files (should be absolute path) should be copied to @@ -455,7 +460,7 @@ function install_daisy() function config_daisy() { echo "====== add relate config for Daisy and Kolla ======" - ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK -b $IS_BARE" + ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK -b $IS_BARE -d $RUN_DOCTOR" } clean_up_target_vms_and_networks |