Merge pull request #1413 from pas256/devel

Inventory script to gracefully handle AWS being down
This commit is contained in:
Michael DeHaan 2012-10-22 16:42:36 -07:00
commit 8afa3abd41

View file

@ -236,6 +236,7 @@ class Ec2Inventory(object):
''' Makes an AWS EC2 API call to the list of instances in a particular
region '''
try:
if self.eucalyptus:
conn = boto.connect_euca(host=self.eucalyptus_host)
conn.APIVersion = '2010-08-31'
@ -247,6 +248,12 @@ class Ec2Inventory(object):
for instance in reservation.instances:
self.add_instance(instance, region)
except boto.exception.BotoServerError as e:
if not self.eucalyptus:
print "Looks like AWS is down again:"
print e
sys.exit(1)
def get_instance(self, region, instance_id):
''' Gets details about a specific instance '''