bugfix for jumpserver on ubuntu 14.04.3

Change-Id: I59a41ca1ec2c0e576b590d5de39c04cd19273614
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
(cherry picked from commit 4a4a18e97eed73c1b82ae83b65cd765160f8ae6c)

3 files changed, 8 insertions, 10 deletions

diff --git a/deploy.sh b/deploy.sh
index 5b315c5c..95c3276d 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -8,11 +8,9 @@ if [[ -z $DEPLOY_COMPASS && -z $DEPLOY_HOST && -z $REDEPLOY_HOST ]]; then
     export DEPLOY_HOST="true"
 fi
 
-for i in python-cheetah python-yaml; do
-    if [[ `dpkg-query -l $i` == 0 ]]; then
-        continue
-    fi
-    sudo apt-get install -y --force-yes  $i
-done
+sudo apt-get install -y --force-yes python-pip
+sudo pip install --upgrade pip
+sudo pip install --upgrade cheetah
+sudo pip install --upgrade pyyaml
 
 $COMPASS_DIR/deploy/launch.sh $*
diff --git a/deploy/deploy_host.sh b/deploy/deploy_host.sh
index f8feacbf..b7859d37 100755
--- a/deploy/deploy_host.sh
+++ b/deploy/deploy_host.sh
@@ -5,7 +5,8 @@ function deploy_host(){
     ssh $ssh_args root@${MGMT_IP} mkdir -p /opt/compass/bin/ansible_callbacks
     scp $ssh_args -r ${COMPASS_DIR}/deploy/status_callback.py root@${MGMT_IP}:/opt/compass/bin/ansible_callbacks/status_callback.py
 
-    reboot_hosts
+    # avoid nodes reboot to fast, cobbler can not give response
+    nohup bash -c "sleep 20;reboot_hosts" &
 
     if [[ "$REDEPLOY_HOST" == true ]]; then
         deploy_flag="redeploy"
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index 77c71c50..db410917 100755
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -31,13 +31,12 @@ function prepare_env() {
     export PYTHONPATH=/usr/lib/python2.7/dist-packages:/usr/local/lib/python2.7/dist-packages
     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-pip python-dev
+    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 pip install --upgrade pip
     sudo pip install --upgrade ansible==1.9.4
     sudo pip install --upgrade virtualenv
     sudo pip install --upgrade netaddr
-    sudo pip install --upgrade oslo.config
+    sudo apt-get install python-oslo.config
     sudo service libvirt-bin restart
 
     # prepare work dir