Commit graph

7 commits

Author SHA1 Message Date
Timur Batyrshin
9ad52632c5 reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 (#5852) 2014-02-03 13:00:40 -06:00
willthames
74f9f91abf Move more responsibility to common EC2 module
Moved `AWS_REGIONS` into `ec2` module
Created `ec2_connect` method in `ec2` module
Updated modules able to use `ec2_connect` and `AWS_REGIONS`
2013-12-17 14:07:24 +10:00
David Hummel
fa93e03f22 Fix issue #5043: ec2_vpc module wait=yes state attribute retrieval 2013-12-05 10:47:22 -05:00
Justin Ludwig
bd9e6a74f7 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
db28902044 Fix pep8 error in ec2_vpc 2013-11-19 16:31:25 -05:00
Michael DeHaan
55a48aacc3 Changelog updates and a few module renames. vpc -> ec2_vpc, githooks -> github_hooks, blacklist -> kernel_blacklist. These are all new in 1.4 so safe to change. 2013-11-18 18:28:21 -05:00
Michael DeHaan
59dd929bbf Update changelog, rename vpc module to ec2_vpc. 2013-11-18 17:59:40 -05:00
Renamed from cloud/vpc (Browse further)