added error checking around boto ec2 connection errors when using a bad region name

pull/3149/head
jclaybaugh 11 years ago
parent e204394c2c
commit 4733dc6b5b

@ -244,7 +244,11 @@ class Ec2Inventory(object):
conn.APIVersion = '2010-08-31'
else:
conn = ec2.connect_to_region(region)
if conn is None:
print("AWS is down or region name: %s likely not supported. connection to region failed." % region)
sys.exit(1)
reservations = conn.get_all_instances()
for reservation in reservations:
for instance in reservation.instances:
@ -279,6 +283,10 @@ class Ec2Inventory(object):
else:
conn = ec2.connect_to_region(region)
if conn is None:
print("AWS is down or region name: %s likely not supported. connection to region failed." % region)
sys.exit(1)
reservations = conn.get_all_instances([instance_id])
for reservation in reservations:
for instance in reservation.instances:

Loading…
Cancel
Save