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

Add version

Browse source
This commit is contained in:
HAMSIK Adam 2015-06-07 00:04:15 +02:00
parent 985cdf2c28
commit 959c65c7e0
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cloud/amazon/ec2_elb_lb.py
View file

@ -61,6 +61,7 @@ options:
- A list of security group names to apply to the elb - A list of security group names to apply to the elb
require: false require: false
default: None default: None
version_added: "2.0"
health_check: health_check:
description: description:
- An associative array of health check configuration settings (see example) - An associative array of health check configuration settings (see example)
@ -73,7 +74,7 @@ options:
aliases: ['aws_region', 'ec2_region'] aliases: ['aws_region', 'ec2_region']
subnets: subnets:
description: description:
- A list of VPC subnets to use when creating ELB. Zones should be empty if using this. - A list of VPC subnets to use when creating ELB. Zones should be empty if using this.
required: false required: false
default: None default: None
aliases: [] aliases: []
@ -82,7 +83,7 @@ options:
description: description:
- 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
version_added: "1.7" version_added: "1.7"
scheme: scheme:
description: description:
@ -152,7 +153,7 @@ EXAMPLES = """
name: "test-vpc" name: "test-vpc"
scheme: internal scheme: internal
state: present state: present
subnets: subnets:
- subnet-abcd1234 - subnet-abcd1234
- subnet-1a2b3c4d - subnet-1a2b3c4d
listeners: listeners:
@ -218,7 +219,7 @@ EXAMPLES = """
instance_port: 80 instance_port: 80
purge_zones: yes purge_zones: yes
# Creates a ELB and assigns a list of subnets to it. # Creates a ELB and assigns a list of subnets to it.
- local_action: - local_action:
module: ec2_elb_lb module: ec2_elb_lb
state: present state: present
@ -302,10 +303,10 @@ class ElbManager(object):
"""Handles ELB creation and destruction""" """Handles ELB creation and destruction"""
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,
scheme="internet-facing", connection_draining_timeout=None, scheme="internet-facing", connection_draining_timeout=None,
cross_az_load_balancing=None, cross_az_load_balancing=None,
stickiness=None, region=None, **aws_connect_params): stickiness=None, region=None, **aws_connect_params):
self.module = module self.module = module
@ -449,7 +450,7 @@ class ElbManager(object):
else: else:
info['cross_az_load_balancing'] = 'no' info['cross_az_load_balancing'] = 'no'
# return stickiness info? # return stickiness info?
return info return info
@ -629,7 +630,7 @@ class ElbManager(object):
self._attach_subnets(subnets_to_attach) self._attach_subnets(subnets_to_attach)
if subnets_to_detach: if subnets_to_detach:
self._detach_subnets(subnets_to_detach) self._detach_subnets(subnets_to_detach)
def _set_zones(self): def _set_zones(self):
"""Determine which zones need to be enabled or disabled on the ELB""" """Determine which zones need to be enabled or disabled on the ELB"""
if self.zones: if self.zones:
@ -734,7 +735,7 @@ class ElbManager(object):
else: else:
self._create_policy(policy_attrs['param_value'], policy_attrs['method'], policy[0]) self._create_policy(policy_attrs['param_value'], policy_attrs['method'], policy[0])
self.changed = True self.changed = True
self._set_listener_policy(listeners_dict, policy) self._set_listener_policy(listeners_dict, policy)
def select_stickiness_policy(self): def select_stickiness_policy(self):
@ -801,7 +802,7 @@ class ElbManager(object):
else: else:
self._set_listener_policy(listeners_dict) self._set_listener_policy(listeners_dict)
def _get_health_check_target(self): def _get_health_check_target(self):
"""Compose target string from healthcheck parameters""" """Compose target string from healthcheck parameters"""
protocol = self.health_check['ping_protocol'].upper() protocol = self.health_check['ping_protocol'].upper()