Adds support for `health_check_period` and `health_check_type` in `ec2_asg` module.

Default is set to 300 seconds, which is AWS default.

This PR fixes a bug (#7898) where instances created within an autoscaling group using the `ec2_asg` module gets immediately terminated because the `health_check_period` is set to 0, which causes the instance to be checked without having the time to actually boot.

Adding `health_check_type` is needed because you may want to check your instance health against an ELB instead of just EC2 default cloudwatch.
pull/7899/head
Frédéric de Villamil 11 years ago
parent 9631309433
commit 1f3663b196

@ -73,6 +73,18 @@ options:
required: false required: false
default: None default: None
version_added: "1.7" version_added: "1.7"
health_check_period:
description:
- Length of time in seconds after a new EC2 instance comes into service that Auto Scaling starts checking its health.
required: false
default: 500 seconds
version_added: "1.7"
health_check_type:
description:
- The service you want the health status from, Amazon EC2 or Elastic Load Balancer.
required: false
default: EC2
version_added: "1.7"
extends_documentation_fragment: aws extends_documentation_fragment: aws
""" """
@ -141,6 +153,8 @@ def create_autoscaling_group(connection, module):
desired_capacity = module.params.get('desired_capacity') desired_capacity = module.params.get('desired_capacity')
vpc_zone_identifier = module.params.get('vpc_zone_identifier') vpc_zone_identifier = module.params.get('vpc_zone_identifier')
set_tags = module.params.get('tags') set_tags = module.params.get('tags')
health_check_period = module.params.get('health_check_period')
health_check_type = module.params.get('health_check_type')
as_groups = connection.get_all_groups(names=[group_name]) as_groups = connection.get_all_groups(names=[group_name])
@ -173,7 +187,9 @@ def create_autoscaling_group(connection, module):
desired_capacity=desired_capacity, desired_capacity=desired_capacity,
vpc_zone_identifier=vpc_zone_identifier, vpc_zone_identifier=vpc_zone_identifier,
connection=connection, connection=connection,
tags=asg_tags) tags=asg_tags,
health_check_period=health_check_period,
health_check_type=health_check_type)
try: try:
connection.create_auto_scaling_group(ag) connection.create_auto_scaling_group(ag)
@ -272,6 +288,8 @@ def main():
vpc_zone_identifier=dict(type='str'), vpc_zone_identifier=dict(type='str'),
state=dict(default='present', choices=['present', 'absent']), state=dict(default='present', choices=['present', 'absent']),
tags=dict(type='list', default=[]), tags=dict(type='list', default=[]),
health_check_period=dict(type='int', default=300),
health_check_type=dict(default='EC2', chices=['EC2', 'ELB']),
) )
) )
module = AnsibleModule(argument_spec=argument_spec) module = AnsibleModule(argument_spec=argument_spec)

Loading…
Cancel
Save