cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'elb-internal' of https://github.com/asnare/ansible into asnare-elb-internal

Browse source
This commit is contained in:
James Cammarata 2014-05-21 08:34:21 -05:00
commit b9a9fb0f04
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cloud/ec2_elb_lb
View file

@ -78,6 +78,11 @@ options:
- Purge existing subnet on ELB that are not found in subnets - Purge existing subnet on ELB that are not found in subnets
required: false required: false
default: false default: false
scheme:
description:
- The scheme to use when creating the ELB. For a private VPC-visible ELB use 'internal'.
required: false
default: 'internet-facing'
validate_certs: validate_certs:
description: description:
- When set to "no", SSL certificates will not be validated for boto versions >= 2.6.0. - When set to "no", SSL certificates will not be validated for boto versions >= 2.6.0.
@ -118,6 +123,7 @@ EXAMPLES = """
- local_action: - local_action:
module: ec2_elb_lb module: ec2_elb_lb
name: "test-vpc" name: "test-vpc"
scheme: internal
state: present state: present
subnets: subnets:
- subnet-abcd1234 - subnet-abcd1234
@ -219,7 +225,7 @@ class ElbManager(object):
def __init__(self, module, name, listeners=None, purge_listeners=None, def __init__(self, module, name, listeners=None, purge_listeners=None,
zones=None, purge_zones=None, security_group_ids=None, zones=None, purge_zones=None, security_group_ids=None,
health_check=None, subnets=None, purge_subnets=None, health_check=None, subnets=None, purge_subnets=None,
region=None, **aws_connect_params): scheme="internet-facing", region=None, **aws_connect_params):
self.module = module self.module = module
self.name = name self.name = name
@ -231,6 +237,7 @@ class ElbManager(object):
self.health_check = health_check self.health_check = health_check
self.subnets = subnets self.subnets = subnets
self.purge_subnets = purge_subnets self.purge_subnets = purge_subnets
self.scheme = scheme
self.aws_connect_params = aws_connect_params self.aws_connect_params = aws_connect_params
self.region = region self.region = region
@ -275,7 +282,8 @@ class ElbManager(object):
'zones': check_elb.availability_zones, 'zones': check_elb.availability_zones,
'security_group_ids': check_elb.security_groups, 'security_group_ids': check_elb.security_groups,
'status': self.status, 'status': self.status,
'subnets': self.subnets 'subnets': self.subnets,
'scheme': check_elb.scheme
} }
if check_elb.health_check: if check_elb.health_check:
@ -309,7 +317,7 @@ class ElbManager(object):
def _get_elb_connection(self): def _get_elb_connection(self):
try: try:
return connect_to_aws(boto.ec2.elb, self.region, return connect_to_aws(boto.ec2.elb, self.region,
**self.aws_connect_params) **self.aws_connect_params)
except boto.exception.NoAuthHandlerFound, e: except boto.exception.NoAuthHandlerFound, e:
self.module.fail_json(msg=str(e)) self.module.fail_json(msg=str(e))
@ -327,7 +335,8 @@ class ElbManager(object):
zones=self.zones, zones=self.zones,
security_groups=self.security_group_ids, security_groups=self.security_group_ids,
complex_listeners=listeners, complex_listeners=listeners,
subnets=self.subnets) subnets=self.subnets,
scheme=self.scheme)
if self.elb: if self.elb:
self.changed = True self.changed = True
self.status = 'created' self.status = 'created'
@ -545,7 +554,8 @@ def main():
security_group_ids={'default': None, 'required': False, 'type': 'list'}, security_group_ids={'default': None, 'required': False, 'type': 'list'},
health_check={'default': None, 'required': False, 'type': 'dict'}, health_check={'default': None, 'required': False, 'type': 'dict'},
subnets={'default': None, 'required': False, 'type': 'list'}, subnets={'default': None, 'required': False, 'type': 'list'},
purge_subnets={'default': False, 'required': False, 'type': 'bool'} purge_subnets={'default': False, 'required': False, 'type': 'bool'},
scheme={'default': 'internet-facing', 'required': False}
) )
) )
@ -567,6 +577,7 @@ def main():
health_check = module.params['health_check'] health_check = module.params['health_check']
subnets = module.params['subnets'] subnets = module.params['subnets']
purge_subnets = module.params['purge_subnets'] purge_subnets = module.params['purge_subnets']
scheme = module.params['scheme']
if state == 'present' and not listeners: if state == 'present' and not listeners:
module.fail_json(msg="At least one port is required for ELB creation") module.fail_json(msg="At least one port is required for ELB creation")
@ -574,10 +585,10 @@ def main():
if state == 'present' and not (zones or subnets): if state == 'present' and not (zones or subnets):
module.fail_json(msg="At least one availability zone or subnet is required for ELB creation") module.fail_json(msg="At least one availability zone or subnet is required for ELB creation")
elb_man = ElbManager(module, name, listeners, purge_listeners, zones, elb_man = ElbManager(module, name, listeners, purge_listeners, zones,
purge_zones, security_group_ids, health_check, purge_zones, security_group_ids, health_check,
subnets, purge_subnets, subnets, purge_subnets,
region=region, **aws_connect_params) scheme, region=region, **aws_connect_params)
if state == 'present': if state == 'present':
elb_man.ensure_ok() elb_man.ensure_ok()