diff options
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/compass_vm.sh | 2 | ||||
| -rwxr-xr-x | deploy/prepare.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh index 4c40c1e4..067918da 100644 --- a/deploy/compass_vm.sh +++ b/deploy/compass_vm.sh @@ -30,7 +30,7 @@ function install_compass_core() { function wait_ok() { log_info "wait_compass_ok enter" retry=0 - until timeout 1s ssh $ssh_args root@$MGMT_IP "exit" 2>/dev/null + until timeout 1s ssh $ssh_args root@$MGMT_IP "exit" >/dev/null 2>&1 do log_progress "os install time used: $((retry*100/$1))%" sleep 1 diff --git a/deploy/prepare.sh b/deploy/prepare.sh index 704b540a..67fc4b65 100755 --- a/deploy/prepare.sh +++ b/deploy/prepare.sh @@ -19,9 +19,9 @@ function download_iso() 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 mkisofs bc curl - sudo apt-get install git python-pip python-dev -y - sudo apt-get install libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev -y + sudo apt-get install -y --force-yes mkisofs bc curl + sudo apt-get install -y --force-yes git python-pip 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 sudo pip install --upgrade virtualenv |