Commit Graph

14 Commits (eff2dc23c7823d79033b2fef235814ad328d11b3)

Author SHA1 Message Date
James Cammarata 789a2915d1 Updating profile/security_token version_added labels 11 years ago
James Cammarata d0495f5528 Merge branch 'ec2_security_token' of https://github.com/willthames/ansible into willthames-ec2_security_token 11 years ago
Will Thames 7d0e161662 Work to allow security tokens and profiles to work with Ansible
Allow security tokens and profiles to be used as arguments
to the 'common' ec2 modules

Mostly refactoring to provide two new methods,
`get_aws_connection_info`, which results in a dict that can be
passed through to the boto `connect_to_region` calls, and
`connect_to_aws` that can pass that dict through to the
`connect_to_region` method of the appropriate module.

Tidied up some variable names

Works around boto/boto#2100

profiles don't work with boto < 2.24, but this detects for that
and fails with an appropriate message. It is designed to work
if profile is not passed but boto < 2.24 is installed.

Modifications to allow empty aws auth variables to be passed
(this is useful if wanting to have the keys as an optional
parameter in ec2 calls - if set, use this value, if not set,
use boto config or env variables)

Reworked validate_certs improvements to work with refactoring

Added documentation for profile and security_token to affected modules
11 years ago
willthames 5f7f52d4cc Allow ec2_tag module to list the tags of an instance
Use the list argument to state to just collect the
tags of a resource through the AWS API.
11 years ago
James Cammarata 24759f566c Adding 'validate_certs' option to EC2 modules
When disabled, the boto connection will be instantiated without validating
the SSL certificate from the target endpoint. This allows the modules to connect
to Eucalyptus instances running with self-signed certs without errors.

Fixes #3978
11 years ago
Will Thames f92e4605ab Create a common EC2 connection argument spec for EC2 modules
Refactor the currently well-factored ec2 modules (i.e. those that already use ec2_connect) to
have a common argument spec. The idea is that new modules can use this spec without duplication
of code, and that new functionality can be added to the ec2 connection code (e.g. security
token argument)
11 years ago
jctanner 51fc8ef0a0 Merge pull request #5311 from willthames/ec2_refactor
ec2 modules: Move more responsibility to common EC2 module
11 years ago
willthames 10c06d4e1e Make state=present the default for ec2_tag
Using `ec2_tag` module without the state argument
currently results in:
```
failed: [127.0.0.1] => {"failed": true, "parsed": false}
```
This fix makes `state=present` the default
11 years ago
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`
11 years ago
Brandon Hilkert a6879d14ca Fix checking for existence of EC2 tags 11 years ago
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.
11 years ago
James Tanner 0a5adda059 Fixes #4540 Use shared module snippet to evaluate ec2 credentials 11 years ago
Harrison Gu e31927a03e Fix bug for setting ec2 tags 11 years ago
lwade 649bc49d97 Basic module to tag resources in EC2. 11 years ago