Commit Graph

32 Commits (5783a4e183a83bb6348290495320044c3e26284c)

Author SHA1 Message Date
Bruce Pennypacker 8baeccacab removed unwanted 'if wait else None' 11 years ago
Bruce Pennypacker 733508d07f 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. 11 years ago
Will Thames a203485e8b 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
11 years ago
James Cammarata a21ab1a94f 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
11 years ago
Michael DeHaan 9fa0ec57fb Scrub choices=BOOLEANS from remaining core module references. Correct form in argument_spec is type='dict'. 11 years ago
Michael DeHaan c9e5047abe Update version_added for wait_timeout parameter on elb module. 11 years ago
Michael DeHaan 240aa66221 Merge pull request #6020 from bpennypacker/ec2_elb_timeout
cloud/ec2_elb module: Added wait_timeout parameter
11 years ago
James Cammarata 8760592385 Adding a wait loop to ec2_elb for the initial lb state when registering
Fixes #5305
11 years ago
James Cammarata 6e47729d5a Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params
Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2
11 years ago
Bruce Pennypacker ff41cee78b Added wait_timeout parameter 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
Scott Anderson 26e9c1ad61 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. 11 years ago
Mohan Krishnan ec78be8494 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.
11 years ago
willthames cf359df1c5 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
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
Jim Dalton ab161741a4 Make sure initial_state is initialized 11 years ago
Jim Dalton 557ad6a411 Account for instances that have not yet been registered. Fixes #5076 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
kiri 14d6bda763 add NoneType check. 11 years ago
Jim Dalton 202a17b71d Add enable_availability_zone parameter to ec2 module. 11 years ago
James Cammarata 7db7be192b Modified ec2_elb doc per issue #3849 11 years ago
Bruce Pennypacker 99c8362a82 Added wait parameter 11 years ago
Bruce Pennypacker 11470fea04 Rebase attempt
No idea if I'm rebasing properly or not.  This is my first attempt.
11 years ago
Bruce Pennypacker 6d6e0d5ab8 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.
11 years ago
Michael DeHaan fe6c6e6779 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.
11 years ago
Ian O Connell 8fc80f296e Added an elb_region parameter for interacting with the ec2 elastic load balancer to work with regions other than us-east-1 11 years ago
John Jarvis 724c2f2709 Parameter and variable naming issues 12 years ago
John Jarvis 8098b80e2d changing arg name for consistency, absent/present for registration 12 years ago
John Jarvis 43910bd290 doc update 12 years ago
John Jarvis bfc0ea3b0e marking the state changed only when there are ELBs to work on 12 years ago
John Jarvis 434a9d3501 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.
12 years ago