From 0b3ab62c5a0285a6d3df3d50c6b78cf3d7bb762d Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 11 Aug 2021 09:55:22 +0000 Subject: Infra: AWS self termination Signed-off-by: pmikus Change-Id: I9ecd85d1086f6be1bbaf6a6925da362cc4c1a9ad (cherry picked from commit 44784f12e7a1cfe42927bd301b90015ffa72b7d7) (cherry picked from commit 56b334fb5044d0f29b6e8f91e16f067533196b50) --- fdio.infra.terraform/3n_aws_c5n/deploy/main.tf | 46 ++++++++++++++------------ 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'fdio.infra.terraform/3n_aws_c5n/deploy/main.tf') diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf index 3ca8758678..769aa59f1a 100644 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf +++ b/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf @@ -263,17 +263,18 @@ data "aws_network_interface" "tg_if2" { # Instances resource "aws_instance" "tg" { - ami = var.ami_image - availability_zone = var.avail_zone - instance_type = var.instance_type - key_name = aws_key_pair.CSITKP.key_name - associate_public_ip_address = true - subnet_id = aws_subnet.mgmt.id - private_ip = var.tg_mgmt_ip - vpc_security_group_ids = [aws_security_group.CSITSG.id] - placement_group = aws_placement_group.CSITPG.id - source_dest_check = false - # host_id = "1" + ami = var.ami_image + availability_zone = var.avail_zone + instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior + instance_type = var.instance_type + key_name = aws_key_pair.CSITKP.key_name + associate_public_ip_address = true + subnet_id = aws_subnet.mgmt.id + private_ip = var.tg_mgmt_ip + vpc_security_group_ids = [aws_security_group.CSITSG.id] + placement_group = aws_placement_group.CSITPG.id + source_dest_check = false + # host_id = "1" depends_on = [ aws_vpc.CSITVPC, @@ -291,17 +292,18 @@ resource "aws_instance" "tg" { } resource "aws_instance" "dut1" { - ami = var.ami_image - availability_zone = var.avail_zone - instance_type = var.instance_type - key_name = aws_key_pair.CSITKP.key_name - associate_public_ip_address = true - subnet_id = aws_subnet.mgmt.id - private_ip = var.dut1_mgmt_ip - vpc_security_group_ids = [aws_security_group.CSITSG.id] - placement_group = aws_placement_group.CSITPG.id - source_dest_check = false - # host_id = "2" + ami = var.ami_image + availability_zone = var.avail_zone + instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior + instance_type = var.instance_type + key_name = aws_key_pair.CSITKP.key_name + associate_public_ip_address = true + subnet_id = aws_subnet.mgmt.id + private_ip = var.dut1_mgmt_ip + vpc_security_group_ids = [aws_security_group.CSITSG.id] + placement_group = aws_placement_group.CSITPG.id + source_dest_check = false + # host_id = "2" depends_on = [ aws_vpc.CSITVPC, -- cgit 1.2.3-korg