diff options
| author |   Tomas Alexy <tomas.alexy@pantheon.tech> | 2021-03-16 12:25:09 +0100 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2021-03-29 06:33:18 +0000 |
| commit | 31f82bd3fcbd6299e2e411734767e29b7adb5982 (patch) | |
| tree | 851c4f3f277cabeb18cdad4207ee26d528a4b4d0 /fdio.infra.terraform/2n_aws_c5n/deploy/main.tf | |
| parent | 493684d9a6d22dc86f8260fe8cc4244ba71b5e9e (diff) | |
Infra: AWS deployment improvements
- Add checks where missing
- Serialize instance deployment to prevent race conditions
Deploy tg -> sut1 (-> sut2) then start ansible provisioning on all instances
- Bump AWS provisioner version to 3.32
Signed-off-by: Tomas Alexy <tomas.alexy@pantheon.tech>
Change-Id: I9a53b1de96574674f3608f19a8f5ac297eb1bd86
Diffstat (limited to 'fdio.infra.terraform/2n_aws_c5n/deploy/main.tf')
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/deploy/main.tf | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf index f97d974b38..b9d6f188bb 100644 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf +++ b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf @@ -134,7 +134,7 @@ resource "aws_network_interface" "dut1_if1" { private_ip = var.dut1_if1_ip private_ips = [var.dut1_if1_ip] security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC, aws_subnet.b] + depends_on = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.dut1] attachment { instance = aws_instance.dut1.id @@ -152,7 +152,7 @@ resource "aws_network_interface" "dut1_if2" { private_ip = var.dut1_if2_ip private_ips = [var.dut1_if2_ip] security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC] + depends_on = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.dut1] attachment { instance = aws_instance.dut1.id @@ -170,7 +170,7 @@ resource "aws_network_interface" "tg_if1" { private_ip = var.tg_if1_ip private_ips = [var.tg_if1_ip] security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC, aws_subnet.b] + depends_on = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.tg] attachment { instance = aws_instance.tg.id @@ -188,7 +188,7 @@ resource "aws_network_interface" "tg_if2" { private_ip = var.tg_if2_ip private_ips = [var.tg_if2_ip] security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC, aws_subnet.d] + depends_on = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.tg] attachment { instance = aws_instance.tg.id @@ -242,7 +242,7 @@ resource "aws_instance" "tg" { } resource "aws_instance" "dut1" { - depends_on = [aws_vpc.CSITVPC, aws_placement_group.CSITPG] + depends_on = [aws_vpc.CSITVPC, aws_placement_group.CSITPG, aws_instance.tg] ami = var.ami_image availability_zone = var.avail_zone instance_type = var.instance_type @@ -292,7 +292,10 @@ resource "null_resource" "deploy_tg" { depends_on = [ aws_instance.tg, aws_network_interface.tg_if1, - aws_network_interface.tg_if2 + aws_network_interface.tg_if2, + aws_instance.dut1, + aws_network_interface.dut1_if1, + aws_network_interface.dut1_if2 ] connection { @@ -328,6 +331,9 @@ resource "null_resource" "deploy_tg" { resource "null_resource" "deploy_dut1" { depends_on = [ + aws_instance.tg, + aws_network_interface.tg_if1, + aws_network_interface.tg_if2, aws_instance.dut1, aws_network_interface.dut1_if1, aws_network_interface.dut1_if2 |