From b7058b4b3f823cf4c95c38741dddc68b59b733cc Mon Sep 17 00:00:00 2001
From: Yifei Xue <xueyifei@huawei.com>
Date: Sat, 13 Aug 2016 09:15:22 +0800
Subject: Prepare the jump host offline

JIRA: COMPASS-456

Change-Id: Ieced8e30bde3d19623b5d2486a52f81c1cf295a3
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
---
 deploy/launch.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'deploy/launch.sh')

diff --git a/deploy/launch.sh b/deploy/launch.sh
index 488e0fd7..2c272c79 100755
--- a/deploy/launch.sh
+++ b/deploy/launch.sh
@@ -15,7 +15,6 @@ mkdir -p $WORK_DIR/script
 export DEPLOY_FIRST_TIME=${DEPLOY_FIRST_TIME-"true"}
 
 source ${COMPASS_DIR}/deploy/prepare.sh
-prepare_python_env
 source ${COMPASS_DIR}/util/log.sh
 source ${COMPASS_DIR}/deploy/deploy_parameter.sh
 source $(process_input_para $*) || exit 1
@@ -30,6 +29,16 @@ source ${COMPASS_DIR}/deploy/compass_vm.sh
 source ${COMPASS_DIR}/deploy/deploy_host.sh
 
 ######################### main process
+download_iso
+pre_prepare
+prepare_env
+if [[ "$DEPLOY_COMPASS" == "true" ]]; then
+    if ! prepare_python_env;then
+        echo "prepare_python_env failed"
+        exit 1
+    fi
+fi
+
 print_logo
 
 if [[ ! -z $VIRT_NUMBER ]];then
@@ -46,11 +55,6 @@ fi
 export machines
 
 if [[ "$DEPLOY_COMPASS" == "true" ]]; then
-    if ! prepare_env;then
-        echo "prepare_env failed"
-        exit 1
-    fi
-
     log_info "########## set up network begin #############"
     if ! create_nets;then
         log_error "create_nets failed"
-- 
cgit 1.2.3-korg