From 6a33deae1f8383f0c0c5e442e2f3b8a0cbc523fa Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 12 Sep 2014 13:14:20 +0200
Subject: [PATCH] Only add VM information from EC2 instances if they are
 running. Prevents wrong ZOMBIES computation

---
 src/vmm_mad/remotes/ec2/ec2_driver.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb
index d39cd0921e..f8e5714d02 100755
--- a/src/vmm_mad/remotes/ec2/ec2_driver.rb
+++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb
@@ -327,10 +327,16 @@ class EC2Driver
 
         vms_info = "VM_POLL=YES\n"
 
-        usedcpu = 0
+        #
+        # Add information for running VMs (running and pending).
+        #
+        usedcpu    = 0
         usedmemory = 0
+
         begin
             AWS.ec2.instances.each do |i|
+                next if i.status != :pending && i.status != :running
+
                 poll_data=parse_poll(i)
 
                 one_id = i.tags['ONE_ID']