summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-03-16 07:59:02 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-16 07:59:02 +0000
commitbaf9d4792e97dbb01b2e76299189a2997fb1eb3e (patch)
tree6f9a7b1c24e05830985a7d454a67fb316a23b0a4 /ci
parentfd49859523e1914bece099b326ea723068e33262 (diff)
parent3edd3533122d4abb5d4414ff7032b50cd398037c (diff)
Merge "unify the definition of NETWORK and NETWORK_CONF"
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy/deploy.sh11
1 files changed, 2 insertions, 9 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 0317d0ba..f81afe95 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -26,7 +26,7 @@ cat << EOF
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
`basename $0`: Deploys the Daisy4NFV
-usage: `basename $0` -d dha_conf -n network_con -l lab_name -p pod_name
+usage: `basename $0` -d dha_conf -l lab_name -p pod_name
-r remote_workspace -w workdir
OPTIONS:
@@ -34,7 +34,6 @@ OPTIONS:
-B PXE Bridge for booting Daisy Master, optional
-d Configuration yaml file of DHA, optional, will be deleted later
-D Dry-run, does not perform deployment, will be deleted later
- -n Configuration yaml file of network, optional
-l LAB name, necessary
-p POD name, necessary
-r Remote workspace in target server, optional
@@ -48,7 +47,6 @@ Examples:
sudo `basename $0` -b base_path
-l zte -p pod2 -B pxebr
-d ./deploy/config/vm_environment/zte-virtual1/deploy.yml
- -n ./deploy/config/vm_environment/zte-virtual1/network.yml
-r /opt/daisy -w /opt/daisy
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
EOF
@@ -66,7 +64,6 @@ SCRIPT_PATH=$(readlink -f $(dirname $0))
WORKSPACE=$(cd ${SCRIPT_PATH}/../..; pwd)
VM_STORAGE=/home/qemu/vms
DHA_CONF=''
-NETWORK_CONF=''
LAB_NAME=''
POD_NAME=''
TARGET_HOSTS_NUM=0
@@ -94,9 +91,6 @@ do
D)
DRY_RUN=1
;;
- n)
- NETWORK_CONF=${OPTARG}
- ;;
l)
LAB_NAME=${OPTARG}
;;
@@ -301,8 +295,7 @@ if [ $IS_BARE == 0 ];then
echo "====== add relate config of kolla==========="
ssh $SSH_PARAS $DAISY_IP "mkdir -p /etc/kolla/config/nova"
ssh $SSH_PARAS $DAISY_IP "echo -e '[libvirt]\nvirt_type=qemu\ncpu_mode=none' >> /etc/kolla/config/nova/nova-compute.conf"
- NETWORK_CONF="$REMOTE_SPACE/deploy/config/vm_environment/$LAB_NAME-$POD_NAME/network.yml"
- ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK_CONF"
+ ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK"
fi
echo "===prepare cluster and pxe==="