cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #5236 from willthames/ec2_inv_rds_fail_safe

Browse source 
ec2 inventory: Fail EC2 inventory better with restricted EC2 users
This commit is contained in:
jctanner 2014-01-06 12:57:21 -08:00
commit 57d54c1da5
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/inventory/ec2.py
View file

@ -298,9 +298,10 @@ class Ec2Inventory(object):
for instance in instances: for instance in instances:
self.add_rds_instance(instance, region) self.add_rds_instance(instance, region)
except boto.exception.BotoServerError as e: except boto.exception.BotoServerError as e:
print "Looks like AWS RDS is down: " if not e.reason == "Forbidden":
print e print "Looks like AWS RDS is down: "
sys.exit(1) print e
sys.exit(1)
def get_instance(self, region, instance_id): def get_instance(self, region, instance_id):
''' Gets details about a specific instance ''' ''' Gets details about a specific instance '''