diff options
| author | astro44 <astro_sk@yahoo.com> | 2017-01-25 15:19:38 -0500 |
|---|---|---|
| committer | Ryan Brown <sb@ryansb.com> | 2017-01-25 15:19:38 -0500 |
| commit | d4449d082e01de224e2b5f6b00b11216829ef6ee (patch) | |
| tree | 1182c4b7c6d86a032e6d114cd17df138c33e49c2 | |
| parent | 4a594b3702b01adccb44babdeadfcdc013a67c26 (diff) | |
| download | ansible-d4449d082e01de224e2b5f6b00b11216829ef6ee.tar.gz | |
resource overriden when conn_type='both' (#20206)
Simple change to avoid resource override when using conn_type == 'both'
| -rwxr-xr-x | lib/ansible/module_utils/ec2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/module_utils/ec2.py b/lib/ansible/module_utils/ec2.py index 4c93221e17..50de61ea28 100755 --- a/lib/ansible/module_utils/ec2.py +++ b/lib/ansible/module_utils/ec2.py @@ -113,8 +113,8 @@ def _boto3_conn(conn_type=None, resource=None, region=None, endpoint=None, **par client = boto3.session.Session(profile_name=profile).client(resource, region_name=region, endpoint_url=endpoint, **params) return client else: - resource = boto3.session.Session(profile_name=profile).resource(resource, region_name=region, endpoint_url=endpoint, **params) client = boto3.session.Session(profile_name=profile).client(resource, region_name=region, endpoint_url=endpoint, **params) + resource = boto3.session.Session(profile_name=profile).resource(resource, region_name=region, endpoint_url=endpoint, **params) return client, resource boto3_inventory_conn = _boto3_conn |