summaryrefslogtreecommitdiffstats
path: root/ci/deploy
diff options
context:
space:
mode:
authorzhongjun <zhong.jun@zte.com.cn>2017-04-13 15:14:45 +0800
committerzhongjun <zhong.jun@zte.com.cn>2017-04-14 15:42:02 +0800
commit3f09e7e05515811537376ccad532ac52d4bd3305 (patch)
tree422c1e2a299d91130372fbb5fc3079cc61411f10 /ci/deploy
parent2cf7f098048ef0c11eb1321747b600230a495c88 (diff)
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 <zhong.jun@zte.com.cn>
Diffstat (limited to 'ci/deploy')
-rwxr-xr-xci/deploy/deploy.sh8
1 files changed, 2 insertions, 6 deletions
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