diff options
Diffstat (limited to 'ci/deploy/deploy.sh')
| -rwxr-xr-x | ci/deploy/deploy.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index c508e471..c308ae25 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -64,7 +64,8 @@ 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" - "os-odl-nofeature-noha" "os-odl-nofeature-ha") + "os-odl-nofeature-noha" "os-odl-nofeature-ha" + "os-nosdn-ovs_dpdk-noha" "os-nosdn-ovs_dpdk-ha") # # END of variables to customize @@ -73,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) @@ -106,6 +107,9 @@ do S) SKIP_DEPLOY_DAISY=1 ;; + d) + RUN_DOCTOR=${OPTARG} + ;; h) usage exit 0 @@ -133,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 @@ -186,11 +192,7 @@ function update_dha_by_pdf() local pdf_yaml=labs/$LAB_NAME/${POD_NAME}.yaml local pod_template=config/installers/daisy/pod_config.yaml.j2 local generate_config=config/utils/generate_config.py - if [[ $DEPLOY_SCENARIO =~ (dpdk) ]]; then - local network_template=config/installers/daisy/network-dpdk.yaml.j2 - else - local network_template=config/installers/daisy/network.yaml.j2 - fi + local network_template=config/installers/daisy/network.yaml.j2 if [ ! -f ${generate_config} ] || [ ! -f ${pdf_yaml} ] || [ ! -f ${pod_template} ] || [ ! -f ${network_template} ] ; then echo "Template files donot exist in ${SECURELABDIR}." return @@ -211,6 +213,7 @@ function update_dha_by_pdf() rm $tmpfile return fi + test -d $(dirname ${DHA_CONF}) || mkdir -p $(dirname ${DHA_CONF}) cp ${tmpfile} ${DHA_CONF} echo "====== Update deploy.yml from POD Descriptor File ======" @@ -219,6 +222,7 @@ function update_dha_by_pdf() echo "Cannot generate network configuration from PDF and IDF!" return fi + test -d $(dirname ${NETWORK_CONF}) || mkdir -p $(dirname ${NETWORK_CONF}) cp ${tmpfile} ${NETWORK_CONF} echo "====== Update $(basename ${NETWORK_CONF}) from POD Descriptor File ======" rm -f $tmpfile @@ -456,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 |