Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added placement group as an option for autoscaling groups #3704

Merged
merged 7 commits into from
Dec 4, 2015
Merged

added placement group as an option for autoscaling groups #3704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
006cac5
added placement group as an option for autoscaling groups
dayer4b Oct 30, 2015
0d2007e
as per advice from stack72, simplified
dayer4b Nov 2, 2015
68c7baa
as per advice from stack72 to stick to strings
dayer4b Nov 2, 2015
c7b02d9
handling updates
dayer4b Nov 2, 2015
df41f10
tests! yes! (thanks stack72)
dayer4b Nov 2, 2015
16b0e0d
documentation, thanks again to stack72
dayer4b Nov 2, 2015
bf88ee8
fix test to include creation of placement group
dayer4b Nov 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions builtin/providers/aws/resource_aws_autoscaling_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ func resourceAwsAutoscalingGroup() *schema.Resource {
Set: schema.HashString,
},

"placement_group": &schema.Schema{
Type: schema.TypeString,
Optional: true,
},

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just think the addition to the schema should be really simple:

TypeString
Optional

This goes as per the fact the docs says that the input is a string and can be empty

"load_balancers": &schema.Schema{
Type: schema.TypeSet,
Optional: true,
Expand Down Expand Up @@ -175,6 +180,10 @@ func resourceAwsAutoscalingGroupCreate(d *schema.ResourceData, meta interface{})
autoScalingGroupOpts.HealthCheckGracePeriod = aws.Int64(int64(v.(int)))
}

if v, ok := d.GetOk("placement_group"); ok {
autoScalingGroupOpts.PlacementGroup = aws.String(v.(string))
}

if v, ok := d.GetOk("load_balancers"); ok && v.(*schema.Set).Len() > 0 {
autoScalingGroupOpts.LoadBalancerNames = expandStringList(
v.(*schema.Set).List())
Expand Down Expand Up @@ -222,6 +231,7 @@ func resourceAwsAutoscalingGroupRead(d *schema.ResourceData, meta interface{}) e
d.Set("load_balancers", g.LoadBalancerNames)
d.Set("min_size", g.MinSize)
d.Set("max_size", g.MaxSize)
d.Set("placement_group", g.PlacementGroup)
d.Set("name", g.AutoScalingGroupName)
d.Set("tag", g.Tags)
d.Set("vpc_zone_identifier", strings.Split(*g.VPCZoneIdentifier, ","))
Expand Down Expand Up @@ -276,6 +286,10 @@ func resourceAwsAutoscalingGroupUpdate(d *schema.ResourceData, meta interface{})
}
}

if d.HasChange("placement_group") {
opts.PlacementGroup = aws.String(d.Get("placement_group").(string))
}

if d.HasChange("termination_policies") {
// If the termination policy is set to null, we need to explicitly set
// it back to "Default", or the API won't reset it for us.
Expand Down
8 changes: 8 additions & 0 deletions builtin/providers/aws/resource_aws_autoscaling_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ func TestAccAWSAutoScalingGroup_basic(t *testing.T) {
"aws_autoscaling_group.bar", "termination_policies.0", "OldestInstance"),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "termination_policies.1", "ClosestToNextInstanceHour"),
resource.TestCheckResourceAttr(
"aws_autoscaling_group.bar", "placement_group", "test"),
),
},

Expand Down Expand Up @@ -354,6 +356,11 @@ resource "aws_launch_configuration" "foobar" {
instance_type = "t1.micro"
}

resource "aws_placement_group" "test" {
name = "test"
strategy = "cluster"
}

resource "aws_autoscaling_group" "bar" {
availability_zones = ["us-west-2a"]
name = "foobar3-terraform-test"
Expand All @@ -364,6 +371,7 @@ resource "aws_autoscaling_group" "bar" {
desired_capacity = 4
force_delete = true
termination_policies = ["OldestInstance","ClosestToNextInstanceHour"]
placement_group = "${aws_placement_group.test.name}"

launch_configuration = "${aws_launch_configuration.foobar.name}"

Expand Down
9 changes: 8 additions & 1 deletion website/source/docs/providers/aws/r/autoscaling_group.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ Provides an AutoScaling Group resource.
## Example Usage

```
resource "aws_placement_group" "test" {
name = "test"
strategy = "cluster"
}

resource "aws_autoscaling_group" "bar" {
availability_zones = ["us-east-1a"]
name = "foobar3-terraform-test"
Expand All @@ -22,6 +27,7 @@ resource "aws_autoscaling_group" "bar" {
health_check_type = "ELB"
desired_capacity = 4
force_delete = true
placement_group = "${aws_placement_group.test.id}"
launch_configuration = "${aws_launch_configuration.foobar.name}"

tag {
Expand All @@ -48,7 +54,7 @@ The following arguments are supported:
* `availability_zones` - (Optional) A list of AZs to launch resources in.
Required only if you do not specify any `vpc_zone_identifier`
* `launch_configuration` - (Required) The name of the launch configuration to use.
* `health_check_grace_period` - (Optional) Time after instance comes into service before checking health.
* `health_check_grace_period` - (Optional) Time after instance comes into service before checking health.
* `health_check_type` - (Optional) "EC2" or "ELB". Controls how health checking is done.
* `desired_capacity` - (Optional) The number of Amazon EC2 instances that
should be running in the group. (See also [Waiting for
Expand All @@ -66,6 +72,7 @@ The following arguments are supported:
* `vpc_zone_identifier` (Optional) A list of subnet IDs to launch resources in.
* `termination_policies` (Optional) A list of policies to decide how the instances in the auto scale group should be terminated.
* `tag` (Optional) A list of tag blocks. Tags documented below.
* `placement_group` (Optional) The name of the placement group into which you'll launch your instances, if any.
* `wait_for_capacity_timeout` (Default: "10m") A maximum
[duration](https://golang.org/pkg/time/#ParseDuration) that Terraform should
wait for ASG instances to be healthy before timing out. (See also [Waiting
Expand Down