Commit 4733dc6b by jclaybaugh

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

parent e204394c
......@@ -245,6 +245,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()
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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment