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

[cloud] Use boto connect_to_region so Elasticache works in AWS China (#24250)

Browse source
This commit is contained in:
kwerey 2017-05-16 16:09:54 +01:00 committed by Ryan Brown
parent 6e13e3918f
commit 6f66e88bd8
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/cloud/amazon/elasticache.py
View file

@ -146,8 +146,7 @@ import time
try: try:
import boto import boto
from boto.elasticache.layer1 import ElastiCacheConnection from boto.elasticache import connect_to_region
from boto.regioninfo import RegionInfo
HAS_BOTO = True HAS_BOTO = True
except ImportError: except ImportError:
HAS_BOTO = False HAS_BOTO = False
@ -430,10 +429,8 @@ class ElastiCacheManager(object):
def _get_elasticache_connection(self): def _get_elasticache_connection(self):
"""Get an elasticache connection""" """Get an elasticache connection"""
try: try:
endpoint = "elasticache.%s.amazonaws.com" % self.region return connect_to_region(
connect_region = RegionInfo(name=self.region, endpoint=endpoint) region_name=self.region,
return ElastiCacheConnection(
region=connect_region,
**self.aws_connect_kwargs **self.aws_connect_kwargs
) )
except boto.exception.NoAuthHandlerFound as e: except boto.exception.NoAuthHandlerFound as e: