wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes error messages to mention ElastiCache

Browse source
This commit is contained in:
Victor Schröder 2015-06-15 10:02:54 +02:00
parent e8c3e3d645
commit f2d22c1373
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/inventory/ec2.py
View file

@ -447,7 +447,7 @@ class Ec2Inventory(object):
if e.error_code == 'AuthFailure':
error = self.get_auth_error_message()
if not e.reason == "Forbidden":
error = "Looks like AWS RDS is down:\n%s" % e.message
error = "Looks like AWS ElastiCache is down:\n%s" % e.message
self.fail_with_error(error)
try:
@ -481,7 +481,7 @@ class Ec2Inventory(object):
if e.error_code == 'AuthFailure':
error = self.get_auth_error_message()
if not e.reason == "Forbidden":
error = "Looks like AWS RDS is down:\n%s" % e.message
error = "Looks like AWS ElastiCache [Replication Groups] is down:\n%s" % e.message
self.fail_with_error(error)
try:
@ -491,7 +491,7 @@ class Ec2Inventory(object):
replication_groups = response['DescribeReplicationGroupsResponse']['DescribeReplicationGroupsResult']['ReplicationGroups']
except KeyError as e:
error = "ElastiCache query to AWS failed (unexpected format)."
error = "ElastiCache [Replication Groups] query to AWS failed (unexpected format)."
self.fail_with_error(error)
for replication_group in replication_groups: