Merge pull request #5236 from willthames/ec2_inv_rds_fail_safe
ec2 inventory: Fail EC2 inventory better with restricted EC2 users
This commit is contained in:
commit
57d54c1da5
1 changed files with 4 additions and 3 deletions
|
@ -298,6 +298,7 @@ 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:
|
||||||
|
if not e.reason == "Forbidden":
|
||||||
print "Looks like AWS RDS is down: "
|
print "Looks like AWS RDS is down: "
|
||||||
print e
|
print e
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
Loading…
Reference in a new issue