Commit graph

32 commits

Author SHA1 Message Date
Bruce Pennypacker
dc912ca201 removed unwanted 'if wait else None' 2014-04-24 20:41:51 +00:00
Bruce Pennypacker
2be8feebce Changed behavior of deregister. If an instance is not found in the ELB then simply return 'changed=false'. Otherwise always remove the instance from the ELB no matter what state its currently in. 2014-04-22 18:44:41 +00:00
Will Thames
e7b275483c Use common code for ec2_elb and ec2_elb_lb
Uses the new get_aws_connection_info
and connect_to_aws common methods to reuse code

Now complains if region is not set in one of the
three possible methods

Also moved over to common documentation code so
this is actually based on #6913
2014-04-09 22:47:51 +10:00
James Cammarata
6e809c2be3 Removing wait loop around initial state check during registration
Also fixed a bug in which the state parameter was marked as a 'bool'
type, which was breaking execution of the module.

Fixes #6543
2014-03-29 23:47:11 -05:00
Michael DeHaan
0e8c7b1c03 Scrub choices=BOOLEANS from remaining core module references. Correct form in argument_spec is type='dict'. 2014-03-28 11:41:35 -04:00
Michael DeHaan
10f852a807 Update version_added for wait_timeout parameter on elb module. 2014-03-11 11:22:17 -04:00
Michael DeHaan
f6878d4ada Merge pull request #6020 from bpennypacker/ec2_elb_timeout
cloud/ec2_elb module: Added wait_timeout parameter
2014-03-11 10:21:38 -05:00
James Cammarata
7f1989dc9c Adding a wait loop to ec2_elb for the initial lb state when registering
Fixes #5305
2014-03-03 10:12:03 -06:00
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
Bruce Pennypacker
899811f339 Added wait_timeout parameter 2014-02-14 20:16:58 +00:00
James Cammarata
056d54ebd3 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
2014-02-13 12:32:49 -06: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
Mohan Krishnan
0f95961e33 Fix exception being thrown for new instance
Currently if we are trying to register an instance that has not yet
been registered with the elb an exception is thrown.
2014-01-27 20:18:55 +07:00
willthames
238da3cb02 ec2_elb module: Minor improvements to documentation
ELB(s) cause a weird formatting behaviour - it appears as EL**s**
Added choices documentation to the state option
2014-01-16 13:14:44 +10:00
willthames
12005a1cd0 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
Jim Dalton
aa329b4b48 Make sure initial_state is initialized 2013-12-12 13:09:40 -08:00
Jim Dalton
ac1e84d976 Account for instances that have not yet been registered. Fixes #5076 2013-12-09 19:38:03 -08: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
afa5988391 Fixes #4540 Use shared module snippet to evaluate ec2 credentials 2013-11-01 11:59:24 -04:00
kiri
c1c32c75ac add NoneType check. 2013-10-28 21:35:57 +09:00
Jim Dalton
3ea0b2bc05 Add enable_availability_zone parameter to ec2 module. 2013-09-23 08:58:47 -07:00
James Cammarata
d27372ff08 Modified ec2_elb doc per issue #3849 2013-09-03 16:13:25 -05:00
Bruce Pennypacker
80ddb1aee6 Added wait parameter 2013-08-23 13:56:59 -04: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
Bruce Pennypacker
8171b7ba48 Added optional region parameter. Fail if you specify an ELB that doesn't exist.
Boto blindly assumes the us-east-1 region if you don't hardcode a
region in it's config, so you could end up attempting to modify ELB's
in one region from a totally different region.  If a region isn't
specified then default to the region that the module is being run
within rather than the default us-east-1 region since it's a pretty
safe assumption that you intend to work on the ELB's within your
current region.

Also throw an error if a specified ELB instance doesn't exist.  The old
behavior would be to silently succeed with changed=false, so if you had
so much as a typo in the name of your ELB (or were in the wrong region
like my initial testing) you wouldn't get a clear indication that a
problem had occurred.
2013-08-01 16:50:01 -04:00
Michael DeHaan
d6449711ae Revert "Added an elb_region parameter for interacting with the ec2 elastic load balancer to work with regions other than us-east-1"
This reverts commit 1264a5b47d.
2013-07-20 10:48:39 -04:00
Ian O Connell
1264a5b47d Added an elb_region parameter for interacting with the ec2 elastic load balancer to work with regions other than us-east-1 2013-07-19 18:21:51 -07:00
John Jarvis
e5d9dad205 Parameter and variable naming issues 2013-05-03 06:55:06 -04:00
John Jarvis
a45b312907 changing arg name for consistency, absent/present for registration 2013-05-02 21:29:36 -04:00
John Jarvis
e625155cd5 doc update 2013-04-30 09:03:31 -04:00
John Jarvis
70b61f13e4 marking the state changed only when there are ELBs to work on 2013-04-30 09:00:10 -04:00
John Jarvis
e9254fbc5a Adding module to de-register/register EC2 instances
This module handles AWS EC2 ELB registration.

* De-registration requires the instance id which can be looked up using
  the ec2_facts module.
* Registration requires both the instance id and the elbs that the
  instance belongs to.

De-registration will return an ec2_elb fact that can be used for
registration in post_tasks.
2013-04-29 23:40:17 -04:00