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

fix: Get on_demand_allocation_strategy from local.workers_group_defaults when deciding to use mixed_instances_policy #908

Merged
merged 2 commits into from
Jun 24, 2020
Merged

fix: Get on_demand_allocation_strategy from local.workers_group_defaults when deciding to use mixed_instances_policy #908

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2dfcd3
Get on_demand_allocation_strategy from local.workers_group_defaults w…
trnubo Jun 5, 2020
4793c4b
Merge branch 'master' into fix_on_demand_allocation_strategy_defaults
barryib Jun 24, 2020
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
4 changes: 2 additions & 2 deletions workers_launch_template.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ resource "aws_autoscaling_group" "workers_launch_template" {

dynamic mixed_instances_policy {
iterator = item
for_each = (lookup(var.worker_groups_launch_template[count.index], "override_instance_types", null) != null) || (lookup(var.worker_groups_launch_template[count.index], "on_demand_allocation_strategy", null) != null) ? list(var.worker_groups_launch_template[count.index]) : []
for_each = (lookup(var.worker_groups_launch_template[count.index], "override_instance_types", null) != null) || (lookup(var.worker_groups_launch_template[count.index], "on_demand_allocation_strategy", local.workers_group_defaults["on_demand_allocation_strategy"]) != null) ? list(var.worker_groups_launch_template[count.index]) : []

content {
instances_distribution {
Expand Down Expand Up @@ -153,7 +153,7 @@ resource "aws_autoscaling_group" "workers_launch_template" {
}
dynamic launch_template {
iterator = item
for_each = (lookup(var.worker_groups_launch_template[count.index], "override_instance_types", null) != null) || (lookup(var.worker_groups_launch_template[count.index], "on_demand_allocation_strategy", null) != null) ? [] : list(var.worker_groups_launch_template[count.index])
for_each = (lookup(var.worker_groups_launch_template[count.index], "override_instance_types", null) != null) || (lookup(var.worker_groups_launch_template[count.index], "on_demand_allocation_strategy", local.workers_group_defaults["on_demand_allocation_strategy"]) != null) ? [] : list(var.worker_groups_launch_template[count.index])

content {
id = aws_launch_template.workers_launch_template.*.id[count.index]
Expand Down