diff options
author | varac <varacanero@zeromail.org> | 2014-08-25 11:39:12 +0000 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2014-08-25 11:39:12 +0000 |
commit | f68e33ca1e736ebca506a17cc446a9f93f821501 (patch) | |
tree | ac9d87ec3f28ffec9b725fe707c01406dec1a6ab | |
parent | 739535301cd9cd29604a36a0ab6495ccb5f54e3a (diff) |
sorted functions order
-rwxr-xr-x | leap-platform-test | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/leap-platform-test b/leap-platform-test index 88b7b36..f49630b 100755 --- a/leap-platform-test +++ b/leap-platform-test @@ -149,6 +149,17 @@ get_ip () { grep ip_address $PROVIDERDIR/nodes/$1.json |cut -f 2 -d:|sed 's/[",]//g' } +ip_pingable () { + ping -q -W10 -c1 $1 >/dev/null 2>&1 + return $? +} + +log_start() { + echo + echo "Starting $0 on `date`" +} + + reset_deploy() { local nodes=$@ @@ -186,34 +197,11 @@ reset_deploy() { } - -log_start() { - echo - echo "Starting $0 on `date`" -} - -ip_pingable () { - ping -q -W10 -c1 $1 >/dev/null 2>&1 - return $? -} - ssh_up () { nc -w 4 $1 22 > /dev/null return $? } -wait_for_node() { - vm=$1 - ip=`get_ip $vm` - online=0 - echo "Waiting for ssh on VM $vm (IP: $ip) to come up..." - while [ $online -eq 0 ] - do - ssh_up $ip && online=1 - sleep 1 - done -} - update_leap_cli () { cd $LEAP_SRC git pull @@ -258,6 +246,18 @@ versions () { echo } +wait_for_node() { + vm=$1 + ip=`get_ip $vm` + online=0 + echo "Waiting for ssh on VM $vm (IP: $ip) to come up..." + while [ $online -eq 0 ] + do + ssh_up $ip && online=1 + sleep 1 + done +} + # http://docs.vagrantup.com/v2/providers/default.html export VAGRANT_DEFAULT_PROVIDER="libvirt" |