Merge "Output log when compute node is back online"
authorRyota Mibu <r-mibu@cq.jp.nec.com>
Tue, 22 Mar 2016 23:35:56 +0000 (23:35 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 22 Mar 2016 23:35:56 +0000 (23:35 +0000)
tests/run.sh

index 167a16b..5e1eb37 100755 (executable)
@@ -161,8 +161,6 @@ cleanup() {
     stop_monitor
     stop_inspector
     stop_consumer
-    ssh $ssh_opts_cpu "heat-admin@$COMPUTE_IP" \
-        "[ -e disable_network.log ] && cat disable_network.log"
 
     python ./nova_force_down.py "$COMPUTE_HOST" --unset
     sleep 1
@@ -178,6 +176,8 @@ cleanup() {
     #TODO: add host status check via nova admin api
     echo "waiting disabled compute host back to be enabled..."
     sleep 180
+    ssh $ssh_opts_cpu "heat-admin@$COMPUTE_IP" \
+        "[ -e disable_network.log ] && cat disable_network.log"
 }