Browse code

Merge "use openstack command instead of nova command"

Zuul authored on 2018/01/30 01:35:56
Showing 1 changed files
... ...
@@ -503,13 +503,13 @@ function ping_check {
503 503
 function get_instance_ip {
504 504
     local vm_id=$1
505 505
     local network_name=$2
506
-    local nova_result
506
+    local addresses
507 507
     local ip
508 508
 
509
-    nova_result="$(nova show $vm_id)"
510
-    ip=$(echo "$nova_result" | grep "$network_name" | get_field 2)
509
+    addresses=$(openstack server show -c addresses -f value "$vm_id")
510
+    ip=$(echo $addresses | sed -n "s/^.*$network_name=\([0-9\.]*\).*$/\1/p")
511 511
     if [[ $ip = "" ]];then
512
-        echo "$nova_result"
512
+        echo "addresses of server $vm_id : $addresses"
513 513
         die $LINENO "[Fail] Couldn't get ipaddress of VM"
514 514
     fi
515 515
     echo $ip