Merge pull request #1 from dajohnso/tweak_ec2

add option for termintated instances

mgmtsystem/ec2.py

@@ -70,9 +70,13 @@ def info(self):
         """Returns the current versions of boto and the EC2 API being used"""
         return '%s %s' % (boto.UserAgent, self.api.APIVersion)
 
-    def list_vm(self):
+    def list_vm(self, include_terminated=True):
         """Returns a list from instance IDs currently active on EC2 (not terminated)"""
-        instances = [inst for inst in self._get_all_instances() if inst.state != 'terminated']
+        instances = None
+        if include_terminated:
+            instances = [inst for inst in self._get_all_instances() if inst.state != 'terminated']
+        else:
+            instances = [inst for inst in self._get_all_instances()]
         return [i.tags.get('Name', i.id) for i in instances]
 
     def list_template(self):