Merge lp:~samuel-cozannet/orange-box/improved-status into lp:orange-box

[Samuel Cozannet]

Improving how the script queries the system to know if KVM nodes are up.

=== modified file 'usr/bin/orange-box-status-all-nodes'
--- usr/bin/orange-box-status-all-nodes	2014-10-02 13:12:21 +0000
+++ usr/bin/orange-box-status-all-nodes	2014-10-10 08:49:07 +0000
@@ -34,17 +34,17 @@
 status_all_nodes() {
 	# Check all VM nodes
 	for i in $(seq 0 2); do
-		if ps -ef | grep -qs "kvm.*node0vm${i}.maas" >/dev/null 2>&1; then
+		if virsh list --all | grep node0vm${i} | grep running >/dev/null 2>&1; then
 			okay "[node0vm${i}]: Is running"
+			uptime=$(ssh node0vm${i}.maas "uptime" 2>/dev/null)
+			if [ -n "$uptime" ]; then
+				okay "[node0vm${i}]:  SSH to node successful; uptime=[$uptime]"
+			else
+				error "[node0vm${i}]:  SSH to node unsuccessful; uptime=[$uptime]"
+			fi
 		else
 			error "[node0vm${i}]: Is not running"
 		fi
-		uptime=$(ssh node0vm${i}.maas "uptime" 2>/dev/null)
-		if [ -n "$uptime" ]; then
-			okay "[node0vm${i}]:  SSH to node successful; uptime=[$uptime]"
-		else
-			error "[node0vm${i}]:  SSH to node unsuccessful; uptime=[$uptime]"
-		fi
 	done
 	# Check all AMT nodes
 	for i in $(seq 1 9); do