From 1f3663b19615b34045c04bb164fd93df708d43ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20de=20Villamil?= Date: Mon, 23 Jun 2014 12:09:31 +0200 Subject: [PATCH] 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. --- library/cloud/ec2_asg | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) mode change 100644 => 100755 library/cloud/ec2_asg diff --git a/library/cloud/ec2_asg b/library/cloud/ec2_asg old mode 100644 new mode 100755 index a9ff3918bd0..71c353569b2 --- a/library/cloud/ec2_asg +++ b/library/cloud/ec2_asg @@ -73,6 +73,18 @@ options: required: false default: None 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 """ @@ -141,6 +153,8 @@ def create_autoscaling_group(connection, module): desired_capacity = module.params.get('desired_capacity') vpc_zone_identifier = module.params.get('vpc_zone_identifier') 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]) @@ -173,7 +187,9 @@ def create_autoscaling_group(connection, module): desired_capacity=desired_capacity, vpc_zone_identifier=vpc_zone_identifier, connection=connection, - tags=asg_tags) + tags=asg_tags, + health_check_period=health_check_period, + health_check_type=health_check_type) try: connection.create_auto_scaling_group(ag) @@ -272,6 +288,8 @@ def main(): vpc_zone_identifier=dict(type='str'), state=dict(default='present', choices=['present', 'absent']), 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)