Commit graph

19 commits

Author SHA1 Message Date
James Cammarata
8a7c68dc18 Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params
Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2
2014-02-26 09:37:26 -06:00
Scott Patten
dbde446358 In the route53 module, documenting that TXT and SPF requests
must be surrounded by quotes.

Otherwise you get a cryptic error message from Route 53.
2014-02-21 19:36:22 -08:00
Amir H. Hajizamani
cf5b1620b7 Remove superfluous/invalid quote
Allow the example to be copy-pasted with minimal confusion about the error.
2014-02-14 16:44:55 +00:00
Scott Anderson
baf508a379 Change standard AWS access and secret key parameter names to aws_access_key and aws_secret_key. Fixes an authentication problem with the rds module and standardizes the naming convention on something more encompassing than ec2_*_key. 2014-02-08 18:35:26 -05:00
Amir H. Hajizamani
b0bc2bd86a Fix missing quote mark in route53 doc example 2014-02-05 13:59:31 +00:00
Matt Paine
d392e067bf Enable changes to ttl of a record to be propogated to route53 2014-01-15 09:51:59 +10:00
Justin Ludwig
26374d89a0 Fix AWS credential params for s3 and other modules
The `ec2_ami`, `ec2_elb`, `ec2_tag`, `ec2_vpc`, `route53`, and `s3` modules
all canonicalize the AWS access and secret key params as
`aws_access_key` and `aws_secret_key`. However, following the fixes for #4540,
those modules now use `get_ec2_creds` from `lib/ansible/module_utils/ec2.py`,
which requires access/secret key params to be canonicalized as
`ec2_access_key` and `ec2_secret_key`. As a result, AWS credentials passed
to those six modules as parameters are ignored (they instead always use
the AWS credentials specified via environment variables, or nothing).

So this change fixes those six modules to canonicalize the
AWS access and secret key params as `ec2_access_key` and `ec2_secret_key`,
allowing them to again accept AWS credentials passed via module params.
2013-11-26 19:29:06 -08:00
James Tanner
0ecc83fe98 Change route53 module to use shared ec2 authorization module snippet 2013-11-12 14:16:30 -05:00
Michael DeHaan
119b6d73dd Remove examples of module antipattern of setting the choices array for boolean types. 2013-10-11 08:45:13 -04:00
Joost Cassee
bd10aad71f Add in a retry loop for route53 requests
The route53 api doesn't allow multiple overlapping requests, so if
it is still processing a previous request when the next comes in will
return an error.

Fixes #4085
2013-10-09 12:50:41 -05:00
James Cammarata
2f6dcfe36f Fixed small typo from the merge conflict in the route53 module 2013-08-23 13:40:57 -05:00
James Cammarata
bb75050912 Merge branch 'rb2' of https://github.com/bpennypacker/ansible into bpennypacker-rb2
Conflicts:
	library/cloud/route53
2013-08-23 11:36:45 -05:00
Arthur Taylor
1dd3ff3879 Added Overwrite option for Route53 record creation 2013-08-22 12:46:20 -05:00
Bruce Pennypacker
0f458210bc Rebase attempt
No idea if I'm rebasing properly or not.  This is my first attempt.
2013-08-20 15:14:16 -04:00
Michael DeHaan
524c7bd791 Remove end of line semicolons. 2013-07-21 11:55:38 -04:00
Michael DeHaan
c5cbb1dc62 Fix route53 module docs version/module name 2013-07-21 11:20:37 -04:00
Bruce Pennypacker
cf3f9380d0 added AAAA example 2013-07-18 17:12:14 -04:00
Bruce Pennypacker
e9de70668b fixed doc typos 2013-07-18 15:41:44 -04:00
Bruce Pennypacker
a5e9057752 AWS route53 module 2013-07-18 13:45:00 -04:00