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

Casper Upgrade v12 and Bug Fixes #7

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Casper Upgrade v12 and Bug Fixes #7

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fafb345
remove extra brackets around aws_launch_configuration.ecs security gr…
Falpangaea Jan 2, 2020
cd7b21a
mulitple formats in tag block:
Falpangaea Jan 2, 2020
7c19cd6
replaced merge method in main.tf 113 with a flatten and concat
Falpangaea Jan 2, 2020
3c6835e
merge was the right function so replaced the added concat with merge,…
Falpangaea Jan 2, 2020
2494f53
changed the map to a json block and rmeoved the flatten
Falpangaea Jan 2, 2020
249d455
changed back to a map and wrapped in quotes and curly brackets
Falpangaea Jan 2, 2020
36b9e57
changed merge to concat and made the singular map a list
Falpangaea Jan 2, 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
23 changes: 8 additions & 15 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ resource "aws_launch_configuration" "ecs" {
# If the expression in the following list itself returns a list, remove the
# brackets to avoid interpretation as a list of lists. If the expression
# returns a single list item then leave it as-is and remove this TODO comment.
security_groups = [concat([aws_security_group.ecs.id], var.security_group_ids)]
security_groups = concat([aws_security_group.ecs.id], var.security_group_ids)
associate_public_ip_address = var.associate_public_ip_address
spot_price = var.spot_bid_price

Expand Down Expand Up @@ -109,13 +109,9 @@ resource "aws_autoscaling_group" "ecs" {
load_balancers = var.load_balancers
enabled_metrics = var.enabled_metrics

tags = merge(
{
"key" = "Name"
"value" = "${var.name} ${var.tagName}"
"propagate_at_launch" = true
},
var.extra_tags,
tags = concat(
[map("key","Name","value","${var.name} ${var.tagName}","propagate_at_launch",true)],
var.extra_tags
)

lifecycle {
Expand All @@ -140,13 +136,10 @@ resource "aws_autoscaling_group" "ecs_second" {
load_balancers = var.load_balancers
enabled_metrics = var.enabled_metrics

tags = merge(
{
"key" = "Name"
"value" = "${var.name} ${var.tagName} Second"
"propagate_at_launch" = true
},
var.extra_tags,

tags = concat(
[map("key","Name","value","${var.name} ${var.tagName} Second","propagate_at_launch",true)],
var.extra_tags
)

lifecycle {
Expand Down