* add support for NLB * added version for parameter type
This commit is contained in:
parent
b91117dac8
commit
78858a5b12
1 changed files with 59 additions and 27 deletions
|
@ -101,12 +101,20 @@ options:
|
||||||
description:
|
description:
|
||||||
- A dictionary of one or more tags to assign to the load balancer.
|
- A dictionary of one or more tags to assign to the load balancer.
|
||||||
required: false
|
required: false
|
||||||
|
type:
|
||||||
|
description:
|
||||||
|
- Type of Load Balaner, Application or Network Load Balancer.
|
||||||
|
required: false
|
||||||
|
default: application
|
||||||
|
choices: ['application', 'network']
|
||||||
|
version_added: "2.5"
|
||||||
extends_documentation_fragment:
|
extends_documentation_fragment:
|
||||||
- aws
|
- aws
|
||||||
- ec2
|
- ec2
|
||||||
notes:
|
notes:
|
||||||
- Listeners are matched based on port. If a listener's port is changed then a new listener will be created.
|
- Listeners are matched based on port. If a listener's port is changed then a new listener will be created.
|
||||||
- Listener rules are matched based on priority. If a rule's priority is changed then a new rule will be created.
|
- Listener rules are matched based on priority. If a rule's priority is changed then a new rule will be created.
|
||||||
|
- Security Groups is not a valid parameter for Network Load Balancer.
|
||||||
'''
|
'''
|
||||||
|
|
||||||
EXAMPLES = '''
|
EXAMPLES = '''
|
||||||
|
@ -186,6 +194,21 @@ EXAMPLES = '''
|
||||||
Type: forward
|
Type: forward
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
|
# Create an NLB with listeners
|
||||||
|
- elb_application_lb:
|
||||||
|
name: myelb
|
||||||
|
subnets:
|
||||||
|
- subnet-400d543b
|
||||||
|
- subnet-b57b7edc
|
||||||
|
listeners:
|
||||||
|
- Protocol: TCP # Required. The protocol can only be TCP for Network Load Balancer.
|
||||||
|
Port: 80 # Required. The port on which the load balancer is listening.
|
||||||
|
DefaultActions:
|
||||||
|
- Type: forward # Required. Only 'forward' is accepted at this time
|
||||||
|
TargetGroupName: wp-testing
|
||||||
|
type: network
|
||||||
|
state: present
|
||||||
|
|
||||||
# Remove an ELB
|
# Remove an ELB
|
||||||
- elb_application_lb:
|
- elb_application_lb:
|
||||||
name: myelb
|
name: myelb
|
||||||
|
@ -803,6 +826,12 @@ def create_or_update_elb(connection, connection_ec2, module):
|
||||||
params = dict()
|
params = dict()
|
||||||
params['Name'] = module.params.get("name")
|
params['Name'] = module.params.get("name")
|
||||||
params['Subnets'] = module.params.get("subnets")
|
params['Subnets'] = module.params.get("subnets")
|
||||||
|
params['Type'] = module.params.get("type")
|
||||||
|
|
||||||
|
if params['Type'] == 'application':
|
||||||
|
is_alb = True
|
||||||
|
|
||||||
|
if is_alb:
|
||||||
try:
|
try:
|
||||||
params['SecurityGroups'] = get_ec2_security_group_ids_from_names(module.params.get('security_groups'), connection_ec2, boto3=True)
|
params['SecurityGroups'] = get_ec2_security_group_ids_from_names(module.params.get('security_groups'), connection_ec2, boto3=True)
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
|
@ -837,6 +866,7 @@ def create_or_update_elb(connection, connection_ec2, module):
|
||||||
changed = True
|
changed = True
|
||||||
|
|
||||||
# Security Groups
|
# Security Groups
|
||||||
|
if is_alb:
|
||||||
if set(elb['SecurityGroups']) != set(params['SecurityGroups']):
|
if set(elb['SecurityGroups']) != set(params['SecurityGroups']):
|
||||||
try:
|
try:
|
||||||
connection.set_security_groups(LoadBalancerArn=elb['LoadBalancerArn'], SecurityGroups=params['SecurityGroups'])
|
connection.set_security_groups(LoadBalancerArn=elb['LoadBalancerArn'], SecurityGroups=params['SecurityGroups'])
|
||||||
|
@ -886,6 +916,7 @@ def create_or_update_elb(connection, connection_ec2, module):
|
||||||
# Get current attributes
|
# Get current attributes
|
||||||
current_elb_attributes = get_elb_attributes(connection, module, elb['LoadBalancerArn'])
|
current_elb_attributes = get_elb_attributes(connection, module, elb['LoadBalancerArn'])
|
||||||
|
|
||||||
|
if is_alb:
|
||||||
if access_logs_enabled and current_elb_attributes['access_logs_s3_enabled'] != "true":
|
if access_logs_enabled and current_elb_attributes['access_logs_s3_enabled'] != "true":
|
||||||
update_attributes.append({'Key': 'access_logs.s3.enabled', 'Value': "true"})
|
update_attributes.append({'Key': 'access_logs.s3.enabled', 'Value': "true"})
|
||||||
if not access_logs_enabled and current_elb_attributes['access_logs_s3_enabled'] != "false":
|
if not access_logs_enabled and current_elb_attributes['access_logs_s3_enabled'] != "false":
|
||||||
|
@ -981,6 +1012,7 @@ def main():
|
||||||
scheme=dict(default='internet-facing', choices=['internet-facing', 'internal']),
|
scheme=dict(default='internet-facing', choices=['internet-facing', 'internal']),
|
||||||
state=dict(choices=['present', 'absent'], type='str'),
|
state=dict(choices=['present', 'absent'], type='str'),
|
||||||
tags=dict(default={}, type='dict'),
|
tags=dict(default={}, type='dict'),
|
||||||
|
type=dict(default='application', type='str', choices=['application', 'network']),
|
||||||
wait_timeout=dict(type='int'),
|
wait_timeout=dict(type='int'),
|
||||||
wait=dict(type='bool')
|
wait=dict(type='bool')
|
||||||
)
|
)
|
||||||
|
@ -988,7 +1020,7 @@ def main():
|
||||||
|
|
||||||
module = AnsibleModule(argument_spec=argument_spec,
|
module = AnsibleModule(argument_spec=argument_spec,
|
||||||
required_if=[
|
required_if=[
|
||||||
('state', 'present', ['subnets', 'security_groups'])
|
('state', 'present', ['subnets'])
|
||||||
],
|
],
|
||||||
required_together=(
|
required_together=(
|
||||||
['access_logs_enabled', 'access_logs_s3_bucket', 'access_logs_s3_prefix']
|
['access_logs_enabled', 'access_logs_s3_bucket', 'access_logs_s3_prefix']
|
||||||
|
|
Loading…
Reference in a new issue