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

Updates to version and requirements

Browse source
This commit is contained in:
Mike Mochan 2016-05-08 14:07:21 +10:00 committed by Toshio Kuratomi
parent 2934495efc
commit 9a303f1628
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cloud/amazon/ec2_vpc_peer.py
View file

@ -19,7 +19,7 @@ short_description: create, delete, accept, and reject VPC peering connections be
description: description:
- Read the AWS documentation for VPC Peering Connections - Read the AWS documentation for VPC Peering Connections
U(http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/vpc-peering.html) U(http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/vpc-peering.html)
version_added: "2.1" version_added: "2.2"
options: options:
vpc_id: vpc_id:
description: description:
@ -45,6 +45,7 @@ options:
choices: ['present', 'absent', 'accept', 'reject'] choices: ['present', 'absent', 'accept', 'reject']
author: Mike Mochan(@mmochan) author: Mike Mochan(@mmochan)
extends_documentation_fragment: aws extends_documentation_fragment: aws
requirements: [ botocore, boto3, json ]
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -331,7 +332,7 @@ def main():
module = AnsibleModule(argument_spec=argument_spec) module = AnsibleModule(argument_spec=argument_spec)
if not HAS_BOTO3: if not HAS_BOTO3:
module.fail_json(msg='json and boto3 is required.') module.fail_json(msg='json, botocore and boto3 are required.')
state = module.params.get('state').lower() state = module.params.get('state').lower()
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)