From 812dcc6a4fcc23105926c984a654255788468267 Mon Sep 17 00:00:00 2001 From: Anton Babenko Date: Sat, 6 Oct 2018 16:47:20 +0200 Subject: [PATCH] Fixed #51. t2 and t3 instances can be unlimited --- examples/basic/main.tf | 16 +++++++++++++++- main.tf | 6 +++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/examples/basic/main.tf b/examples/basic/main.tf index c9e0c9e9..6129cb42 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -66,7 +66,7 @@ module "ec2" { module "ec2_with_t2_unlimited" { source = "../../" - instance_count = 2 + instance_count = 1 name = "example-t2-unlimited" ami = "${data.aws_ami.amazon_linux.id}" @@ -76,3 +76,17 @@ module "ec2_with_t2_unlimited" { vpc_security_group_ids = ["${module.security_group.this_security_group_id}"] associate_public_ip_address = true } + +module "ec2_with_t3_unlimited" { + source = "../../" + + instance_count = 1 + + name = "example-t3-unlimited" + ami = "${data.aws_ami.amazon_linux.id}" + instance_type = "t3.large" + cpu_credits = "unlimited" + subnet_id = "${element(data.aws_subnet_ids.all.ids, 0)}" + vpc_security_group_ids = ["${module.security_group.this_security_group_id}"] + associate_public_ip_address = true +} diff --git a/main.tf b/main.tf index a6313d11..9dfe7aca 100644 --- a/main.tf +++ b/main.tf @@ -1,12 +1,12 @@ locals { - is_t2_instance_type = "${replace(var.instance_type, "/^t2\\..*$/", "1") == "1" ? "1" : "0"}" + is_t_instance_type = "${replace(var.instance_type, "/^t[23]{1}\\..*$/", "1") == "1" ? "1" : "0"}" } ###### # Note: network_interface can't be specified together with associate_public_ip_address ###### resource "aws_instance" "this" { - count = "${var.instance_count * (1 - local.is_t2_instance_type)}" + count = "${var.instance_count * (1 - local.is_t_instance_type)}" ami = "${var.ami}" instance_type = "${var.instance_type}" @@ -45,7 +45,7 @@ resource "aws_instance" "this" { } resource "aws_instance" "this_t2" { - count = "${var.instance_count * local.is_t2_instance_type}" + count = "${var.instance_count * local.is_t_instance_type}" ami = "${var.ami}" instance_type = "${var.instance_type}"