diff options
| author |   zhouya <zhou.ya@zte.com.cn> | 2018-01-05 11:19:52 +0800 |
|---|---|---|
| committer | zhouya <zhou.ya@zte.com.cn> | 2018-01-16 11:09:47 +0800 |
| commit | 371916c2ad016c460cee384db0e9ca1c97d11b6f (patch) | |
| tree | ce9247ecf23fd00c9832646da20fcb6713102e7c /ci | |
| parent | 1591bb64f538e0a51ee2e80995d94443711edb99 (diff) | |
Add extra parameter to integrate with doctor
Need to change some parameter of ceilometer
to run doctor. In order not to influence
other scenario, add an extra '-d' argument
for doctor test only to change event_pipelint.yaml
template file in kolla-ansible code.
Change-Id: Ia5536658b2a2698bc1384e255328d4d719cc566c
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
Diffstat (limited to 'ci')
| -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 c508e471..44feb46b 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -73,7 +73,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) @@ -106,6 +106,9 @@ do S) SKIP_DEPLOY_DAISY=1 ;; + d) + RUN_DOCTOR=${OPTARG} + ;; h) usage exit 0 @@ -133,6 +136,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 @@ -456,7 +461,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 |