Bug fix: Prepare the jump host offline

JIRA: COMPASS-456

Change-Id: I44961d30e7f7d173cafc8c3117a208433f724026
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
(cherry picked from commit dcd9f8eadb84793ac294b8a1c7689423fa4a330d)

diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index 4ce7818..97771b8 100755 (executable)
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -9,11 +9,6 @@
 ##############################################################################
 function print_logo()
 {
-#    if ! apt --installed list 2>/dev/null | grep "figlet"
-#    then
-#        sudo apt-get update -y
-#        sudo apt-get install -y --force-yes figlet
-#    fi
 
     figlet -ctf slant Compass Installer
     set +x; sleep 2; set -x
@@ -83,25 +78,25 @@ function  _prepare_python_env() {
              sudo apt-get install -y --force-yes libffi-dev libssl-dev
 
         fi
+   fi
+
+   if [[ ! -z "$JHPKG_URL" ]]; then
+        _pre_pip_setup
    else
-        if [[ ! -z "$JHPKG_URL" ]]; then
-             _pre_pip_setup
-        else
-             sudo pip install --upgrade virtualenv
-             virtualenv $WORK_DIR/venv
-             source $WORK_DIR/venv/bin/activate
-
-             pip install --upgrade cffi
-             pip install --upgrade MarkupSafe
-             pip install --upgrade pip
-             pip install --upgrade cheetah
-             pip install --upgrade pyyaml
-             pip install --upgrade requests
-             pip install --upgrade netaddr
-             pip install --upgrade oslo.config
-             pip install --upgrade ansible
-        fi
-    fi
+        sudo pip install --upgrade virtualenv
+        virtualenv $WORK_DIR/venv
+        source $WORK_DIR/venv/bin/activate
+
+        pip install --upgrade cffi
+        pip install --upgrade MarkupSafe
+        pip install --upgrade pip
+        pip install --upgrade cheetah
+        pip install --upgrade pyyaml
+        pip install --upgrade requests
+        pip install --upgrade netaddr
+        pip install --upgrade oslo.config
+        pip install --upgrade ansible
+   fi
 }
 
 function _pre_env_setup()