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

removed obsolete ec2 resource object

Browse source
This commit is contained in:
Mike Mochan 2016-01-09 17:13:53 +10:00 committed by Toshio Kuratomi
parent 10ce4d8b88
commit 2392395a47
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cloud/amazon/ec2_vpc_peer.py
View file

@ -208,7 +208,7 @@ def create_peer_connection(client, module):
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
def accept_reject_delete(state, client, resource, module): def accept_reject_delete(state, client, module):
changed = False changed = False
params = dict() params = dict()
params['VpcPeeringConnectionId'] = module.params.get('peering_id') params['VpcPeeringConnectionId'] = module.params.get('peering_id')
@ -246,7 +246,6 @@ def main():
try: try:
region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module, boto3=True) region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module, boto3=True)
client = boto3_conn(module, conn_type='client', resource='ec2', region=region, endpoint=ec2_url, **aws_connect_kwargs) client = boto3_conn(module, conn_type='client', resource='ec2', region=region, endpoint=ec2_url, **aws_connect_kwargs)
resource = boto3_conn(module, conn_type='resource', resource='ec2', region=region, endpoint=ec2_url, **aws_connect_kwargs)
except botocore.exceptions.NoCredentialsError, e: except botocore.exceptions.NoCredentialsError, e:
module.fail_json(msg="Can't authorize connection - "+str(e)) module.fail_json(msg="Can't authorize connection - "+str(e))
@ -254,7 +253,7 @@ def main():
(changed, results) = create_peer_connection(client, module) (changed, results) = create_peer_connection(client, module)
module.exit_json(changed=changed, peering_id=results) module.exit_json(changed=changed, peering_id=results)
else: else:
(changed, results) = accept_reject_delete(state, client, resource, module) (changed, results) = accept_reject_delete(state, client, module)
module.exit_json(changed=changed, peering_id=results) module.exit_json(changed=changed, peering_id=results)