Skip to content

A
ansible
Commit f4db6d1a by jclaybaugh
Options

fixed whitespace and added a comment to explain if statement

parent 4733dc6b
Showing with 7 additions and 5 deletions
plugins/inventory/ec2.py
...@@ -245,9 +245,10 @@ class Ec2Inventory(object): ...@@ -245,9 +245,10 @@ class Ec2Inventory(object):
else: else:
conn = ec2.connect_to_region(region) conn = ec2.connect_to_region(region)
if conn is None: # connect_to_region will fail "silently" by returning None if the region name is wrong or not supported
print("AWS is down or region name: %s likely not supported. connection to region failed." % region) if conn is None:
sys.exit(1) print("region name: %s likely not supported, or AWS is down. connection to region failed." % region)
sys.exit(1)
reservations = conn.get_all_instances() reservations = conn.get_all_instances()
for reservation in reservations: for reservation in reservations:
...@@ -283,9 +284,10 @@ class Ec2Inventory(object): ...@@ -283,9 +284,10 @@ class Ec2Inventory(object):
else: else:
conn = ec2.connect_to_region(region) conn = ec2.connect_to_region(region)
# connect_to_region will fail "silently" by returning None if the region name is wrong or not supported
if conn is None: if conn is None:
print("AWS is down or region name: %s likely not supported. connection to region failed." % region) print("region name: %s likely not supported, or AWS is down. connection to region failed." % region)
sys.exit(1) sys.exit(1)
reservations = conn.get_all_instances([instance_id]) reservations = conn.get_all_instances([instance_id])
for reservation in reservations: for reservation in reservations:
......
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