Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Infra: AWS deployment improvements
[csit.git]
/
fdio.infra.terraform
/
2n_aws_c5n
/
deploy
/
main.tf
diff --git
a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf
b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf
index
f97d974
..
b9d6f18
100644
(file)
--- 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]
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
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]
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
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]
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
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]
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
attachment {
instance = aws_instance.tg.id
@@
-242,7
+242,7
@@
resource "aws_instance" "tg" {
}
resource "aws_instance" "dut1" {
}
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
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,
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 {
]
connection {
@@
-328,6
+331,9
@@
resource "null_resource" "deploy_tg" {
resource "null_resource" "deploy_dut1" {
depends_on = [
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
aws_instance.dut1,
aws_network_interface.dut1_if1,
aws_network_interface.dut1_if2