Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

[RFC] Upgrade ecs agent version #2

Merged
merged 1 commit into from
Mar 2, 2017
Merged

[RFC] Upgrade ecs agent version #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion bastion/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ variable "environment" {
}

module "ami" {
source = "github.com/terraform-community-modules/tf_aws_ubuntu_ami/ebs"
source = "git::https://github.com/terraform-community-modules/tf_aws_ubuntu_ami.git//ebs?ref=e6614d7ce66a9a59db1787c8f695d70034b865db"
region = "${var.region}"
distribution = "trusty"
instance_type = "${var.instance_type}"
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ variable "default_ecs_ami" {
us-east-1 = "ami-5f3ff932"
us-west-1 = "ami-31c08551"
us-west-2 = "ami-f3985d93"
eu-west-1 = "ami-ab4bd5d8"
eu-west-1 = "ami-063f1a60"
eu-central-1 = "ami-6c58b103"
ap-northeast-1 = "ami-a69d68c7"
ap-northeast-2 = "ami-7b2de615"
Expand Down
2 changes: 1 addition & 1 deletion packer/base/packer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# https://www.packer.io/docs/builders/amazon-ebs.html
ami:
source_ami: ami-fa82739a
source_ami: ami-d8f4deab
instance_type: c4.2xlarge
ssh_username: ubuntu
ssh_timeout: 10m
Expand Down
4 changes: 2 additions & 2 deletions packer/ecs/root/etc/systemd/system/ecs-agent.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ExecStartPre=/bin/mkdir -p /var/lib/ecs/data
ExecStartPre=/bin/mkdir -p /var/log/ecs
ExecStartPre=-/usr/bin/docker kill ecs-agent
ExecStartPre=-/usr/bin/docker rm ecs-agent
ExecStartPre=-/usr/bin/docker pull amazon/amazon-ecs-agent:v1.9.0
ExecStartPre=-/usr/bin/docker pull amazon/amazon-ecs-agent:v1.13.1
ExecStart=/usr/bin/docker run \
--name=ecs-agent \
--restart=on-failure:10 \
Expand All @@ -26,7 +26,7 @@ ExecStart=/usr/bin/docker run \
--publish=127.0.0.1:51678:51678 \
--env-file=/etc/ecs/ecs.config \
--env=ECS_CLUSTER=${SERVER_GROUP} \
amazon/amazon-ecs-agent:v1.9.0
amazon/amazon-ecs-agent:v1.13.1
ExecStop=-/usr/bin/docker stop ecs-agent

[Install]
Expand Down