summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2017-05-26 17:31:54 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2017-05-26 17:31:54 +0800
commit278452281b011cf009133993907fd47338255e50 (patch)
tree04d1281a395706cf3675d763a0a09d8f16cc31a7 /ci
parent8f3626f39a5e0eb1be7a971dcc2accf5a0b8b569 (diff)
add prepare and post process for baremental deployment
Change-Id: I3026c4dd83cc19246c19ab568005c4c0b37ff9d9 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy/deploy.sh13
1 files changed, 5 insertions, 8 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 6c88dc5a..181d2d6a 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -294,10 +294,8 @@ echo "====== generate known_hosts file in daisy vm ======"
touch $WORKSPACE/known_hosts
scp $WORKSPACE/known_hosts root@$DAISY_IP:/root/.ssh/
-if [ $IS_BARE == 0 ];then
- echo "====== add relate config of kolla ======"
- ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK"
-fi
+echo "====== add relate config of kolla ======"
+ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK"
echo "====== prepare cluster and pxe ======"
ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --cluster 'yes'"
@@ -367,14 +365,13 @@ if [ $? -ne 0 ]; then
fi
-if [ $IS_BARE == 0 ];then
- echo "====== post deploy ======"
- ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/post.sh -n $NETWORK"
-fi
+echo "====== post deploy ======"
+ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/post.sh -n $NETWORK"
echo "====== deploy successfully ======"
exit 0
+
#
# END of main
############################################################################