internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params

Browse Source 
Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2
This commit is contained in:
James Cammarata
2014-02-26 09:37:26 -06:00
parent 168e3cf685 baf508a379
commit 8a7c68dc18
9 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/cloud/ec2_vpc
View File

@@ -480,8 +480,8 @@ def terminate_vpc(module, vpc_conn, vpc_id=None, cidr=None):
def main():
module = AnsibleModule(
argument_spec = dict(
argument_spec = ec2_argument_spec()
argument_spec.update(dict(
cidr_block = dict(),
wait = dict(choices=BOOLEANS, default=False),
wait_timeout = dict(default=300),
@@ -491,13 +491,14 @@ def main():
vpc_id = dict(),
internet_gateway = dict(choices=BOOLEANS, default=False),
route_tables = dict(type='list'),
region = dict(aliases=['aws_region', 'ec2_region'], choices=AWS_REGIONS),
state = dict(choices=['present', 'absent'], default='present'),
ec2_secret_key = dict(aliases=['aws_secret_key', 'secret_key'], no_log=True),
ec2_access_key = dict(aliases=['aws_access_key', 'access_key']),
)
)
module = AnsibleModule(
argument_spec=argument_spec,
)
state = module.params.get('state')
ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module)