Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Small AWS terraform cleanup
[csit.git]
/
resources
/
tools
/
terraform
/
aws
/
nic.tf
diff --git
a/resources/tools/terraform/aws/nic.tf
b/resources/tools/terraform/aws/nic.tf
index
31926e4
..
3efd74f
100644
(file)
--- a/
resources/tools/terraform/aws/nic.tf
+++ b/
resources/tools/terraform/aws/nic.tf
@@
-1,35
+1,35
@@
-resource "aws_network_interface" "dut1_if
2
" {
- subnet_id = aws_subnet.
c
.id
+resource "aws_network_interface" "dut1_if
1
" {
+ subnet_id = aws_subnet.
b
.id
source_dest_check = false
source_dest_check = false
- private_ip = var.dut1_if
2
_ip
- private_ips = [var.dut1_if
2
_ip]
+ private_ip = var.dut1_if
1
_ip
+ private_ips = [var.dut1_if
1
_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
security_groups = [aws_security_group.CSIT.id]
attachment {
- instance
= aws_instance.dut1.id
+ instance = aws_instance.dut1.id
device_index = 1
}
device_index = 1
}
- depends_on = [aws_vpc.CSIT]
+ depends_on = [aws_vpc.CSIT
, aws_subnet.b
]
}
}
-data "aws_network_interface" "dut1_if
2
" {
- id = aws_network_interface.dut1_if
2
.id
+data "aws_network_interface" "dut1_if
1
" {
+ id = aws_network_interface.dut1_if
1
.id
}
}
-resource "aws_network_interface" "dut1_if
1
" {
- subnet_id = aws_subnet.
b
.id
+resource "aws_network_interface" "dut1_if
2
" {
+ subnet_id = aws_subnet.
c
.id
source_dest_check = false
source_dest_check = false
- private_ip = var.dut1_if
1
_ip
- private_ips = [var.dut1_if
1
_ip]
+ private_ip = var.dut1_if
2
_ip
+ private_ips = [var.dut1_if
2
_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
security_groups = [aws_security_group.CSIT.id]
attachment {
- instance
= aws_instance.dut1.id
+ instance = aws_instance.dut1.id
device_index = 2
}
device_index = 2
}
- depends_on = [aws_vpc.CSIT
, aws_subnet.b
]
+ depends_on = [aws_vpc.CSIT]
}
}
-data "aws_network_interface" "dut1_if
1
" {
- id = aws_network_interface.dut1_if
1
.id
+data "aws_network_interface" "dut1_if
2
" {
+ id = aws_network_interface.dut1_if
2
.id
}
resource "aws_network_interface" "dut2_if1" {
}
resource "aws_network_interface" "dut2_if1" {
@@
-39,7
+39,7
@@
resource "aws_network_interface" "dut2_if1" {
private_ips = [var.dut2_if1_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
private_ips = [var.dut2_if1_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
- instance
= aws_instance.dut2.id
+ instance = aws_instance.dut2.id
device_index = 1
}
depends_on = [aws_vpc.CSIT, aws_subnet.c]
device_index = 1
}
depends_on = [aws_vpc.CSIT, aws_subnet.c]
@@
-56,7
+56,7
@@
resource "aws_network_interface" "dut2_if2" {
private_ips = [var.dut2_if2_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
private_ips = [var.dut2_if2_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
- instance
= aws_instance.dut2.id
+ instance = aws_instance.dut2.id
device_index = 2
}
depends_on = [aws_vpc.CSIT, aws_subnet.d]
device_index = 2
}
depends_on = [aws_vpc.CSIT, aws_subnet.d]
@@
-73,7
+73,7
@@
resource "aws_network_interface" "tg_if1" {
private_ips = [var.tg_if1_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
private_ips = [var.tg_if1_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
- instance
= aws_instance.tg.id
+ instance = aws_instance.tg.id
device_index = 1
}
depends_on = [aws_vpc.CSIT, aws_subnet.b]
device_index = 1
}
depends_on = [aws_vpc.CSIT, aws_subnet.b]
@@
-90,7
+90,7
@@
resource "aws_network_interface" "tg_if2" {
private_ips = [var.tg_if2_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
private_ips = [var.tg_if2_ip]
security_groups = [aws_security_group.CSIT.id]
attachment {
- instance
= aws_instance.tg.id
+ instance = aws_instance.tg.id
device_index = 2
}
depends_on = [aws_vpc.CSIT, aws_subnet.d]
device_index = 2
}
depends_on = [aws_vpc.CSIT, aws_subnet.d]