From 3f09e7e05515811537376ccad532ac52d4bd3305 Mon Sep 17 00:00:00 2001 From: zhongjun Date: Thu, 13 Apr 2017 15:14:45 +0800 Subject: add the argument WORKDIR in daisy-img-modify.sh the daisy install tmp workdir can be configurated as an input argument in deploy.sh,and it also should be used in subshell daisy-img-modify.sh,so add the input argument -w workdir in daisy-img-modify.sh. 1.add an input argument -w workdir in daisy-img-modify.sh. 2.modify the WORKDIR default value to /tmp/workdir/daisy. 3.code refactor to put the centos7.qcow2 file clean statement from the deploy.sh to daisy-img-modify.sh. Change-Id: Id375a15ad2839c209329e644c5e032d044604e7d Signed-off-by: zhongjun --- ci/deploy/deploy.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'ci/deploy') diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 4ec2c2f7..3d0ee56e 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -137,7 +137,7 @@ DHA=$REMOTE_SPACE/labs/$LAB_NAME/$POD_NAME/daisy/config/deploy.yml NETWORK=$REMOTE_SPACE/labs/$LAB_NAME/$POD_NAME/daisy/config/network.yml # set temporay workdir -WORKDIR=${WORKDIR:-/tmp/workdir} +WORKDIR=${WORKDIR:-/tmp/workdir/daisy} [[ $POD_NAME =~ (virtual) ]] && IS_BARE=0 @@ -258,16 +258,12 @@ else virsh destroy daisy virsh undefine daisy fi -if [ -f $WORKDIR/daisy/centos7.qcow2 ]; then - rm -rf $WORKDIR/daisy/centos7.qcow2 -fi echo "=======create daisy node================" +$CREATE_QCOW2_PATH/daisy-img-modify.sh -c $CREATE_QCOW2_PATH/centos-img-modify.sh -w $WORKDIR -a $DAISY_IP $PARAS_IMAGE if [ $IS_BARE == 0 ];then - $CREATE_QCOW2_PATH/daisy-img-modify.sh -c $CREATE_QCOW2_PATH/centos-img-modify.sh -a $DAISY_IP $PARAS_IMAGE create_node $VMDELOY_DAISY_SERVER_NET daisy1 $VMDEPLOY_DAISY_SERVER_VM daisy else - $CREATE_QCOW2_PATH/daisy-img-modify.sh -c $CREATE_QCOW2_PATH/centos-img-modify.sh -a $DAISY_IP $PARAS_IMAGE virsh define $BMDEPLOY_DAISY_SERVER_VM virsh start daisy fi -- cgit 1.2.3-korg