Install some dependent packages on jump host for ansible installation

JIRA: COMPASS-462

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

diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index a4f606a..22183f4 100755 (executable)
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -36,13 +36,6 @@ function download_iso()
 }
 
 function prepare_env() {
-   if [[ "$DEPLOY_FIRST_TIME" == "true" ]]; then
-        sudo apt-get update -y
-        sudo apt-get install -y --force-yes mkisofs bc curl ipmitool openvswitch-switch
-        sudo apt-get install -y --force-yes git python-dev
-        sudo apt-get install -y --force-yes libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev
-        sudo apt-get install -y --force-yes libffi-dev libssl-dev
-    fi
 
     sudo service libvirt-bin restart
     if sudo service openvswitch-switch status|grep stop; then
@@ -78,11 +71,20 @@ function  _prepare_python_env() {
    rm -rf $WORK_DIR/venv
    mkdir -p $WORK_DIR/venv
 
-   sudo apt-get install -y --force-yes python-pip
+   if [[ "$DEPLOY_FIRST_TIME" == "true" ]]; then
+        sudo apt-get update -y
+        sudo apt-get install -y --force-yes mkisofs bc curl ipmitool openvswitch-switch
+        sudo apt-get install -y --force-yes git python-dev python-pip
+        sudo apt-get install -y --force-yes libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev
+        sudo apt-get install -y --force-yes libffi-dev libssl-dev
+   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