internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +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

7
library/cloud/route53
View File

@@ -157,19 +157,18 @@ def commit(changes):
time.sleep(500)
def main():
module = AnsibleModule(
argument_spec = dict(
argument_spec = ec2_argument_keys_spec()
argument_spec.update(dict(
command = dict(choices=['get', 'create', 'delete'], required=True),
zone = dict(required=True),
record = dict(required=True),
ttl = dict(required=False, default=3600),
type = dict(choices=['A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'NS'], required=True),
value = dict(required=False),
ec2_secret_key = dict(aliases=['aws_secret_key', 'secret_key'], no_log=True, required=False),
ec2_access_key = dict(aliases=['aws_access_key', 'access_key'], required=False),
overwrite = dict(required=False, type='bool')
)
)
module = AnsibleModule(argument_spec=argument_spec)
command_in = module.params.get('command')
zone_in = module.params.get('zone')