diff options
Diffstat (limited to 'fdio.infra.terraform')
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/.gitignore | 36 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/deploy/main.tf | 51 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf | 9 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/main.tf | 4 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/.gitignore | 36 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/deploy/main.tf | 31 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf | 12 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/main.tf | 4 |
8 files changed, 156 insertions, 27 deletions
diff --git a/fdio.infra.terraform/2n_aws_c5n/.gitignore b/fdio.infra.terraform/2n_aws_c5n/.gitignore new file mode 100644 index 0000000000..223f2ec48c --- /dev/null +++ b/fdio.infra.terraform/2n_aws_c5n/.gitignore @@ -0,0 +1,36 @@ +# Local .terraform directories +**/.terraform/* + +# .tfstate files +*.tfstate +*.tfstate.* +.terraform.lock.hcl +.terraform.tfstate.lock.info + +# Crash log files +crash.log + +# Exclude all .tfvars files, which are likely to contain sentitive data, such as +# password, private keys, and other secrets. These should not be part of version +# control as they are data points which are potentially sensitive and subject +# to change depending on the environment. +# +*.tfvars + +# Ignore override files as they are usually used to override resources locally and so +# are not checked in +override.tf +override.tf.json +*_override.tf +*_override.tf.json + +# Include override files you do wish to add to version control using negated pattern +# +# !example_override.tf + +# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan +# example: *tfplan* + +# Ignore CLI configuration files +.terraformrc +terraform.rc
\ No newline at end of file diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf index 4a086bf0b0..351cec6c54 100644 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf +++ b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf @@ -4,7 +4,7 @@ data "vault_aws_access_credentials" "creds" { } resource "aws_vpc" "CSITVPC" { - assign_generated_ipv6_cidr_block = false + assign_generated_ipv6_cidr_block = true enable_dns_hostnames = false enable_dns_support = true cidr_block = var.vpc_cidr_mgmt @@ -30,7 +30,13 @@ resource "aws_security_group" "CSITSG" { to_port = 22 protocol = "tcp" cidr_blocks = ["0.0.0.0/0"] - ipv6_cidr_blocks = [] + } + + ingress { + from_port = 22 + to_port = 22 + protocol = "tcp" + ipv6_cidr_blocks = ["::/0"] } ingress { @@ -38,7 +44,7 @@ resource "aws_security_group" "CSITSG" { to_port = 0 protocol = -1 self = true - ipv6_cidr_blocks = [] + ipv6_cidr_blocks = ["::/0"] } egress { @@ -46,7 +52,13 @@ resource "aws_security_group" "CSITSG" { to_port = 0 protocol = "-1" cidr_blocks = ["0.0.0.0/0"] - ipv6_cidr_blocks = [] + } + + egress { + from_port = 0 + to_port = 0 + protocol = "-1" + ipv6_cidr_blocks = ["::/0"] } tags = { @@ -87,6 +99,7 @@ resource "aws_subnet" "mgmt" { depends_on = [ aws_vpc.CSITVPC ] + ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 1) map_public_ip_on_launch = false vpc_id = aws_vpc.CSITVPC.id @@ -97,12 +110,13 @@ resource "aws_subnet" "mgmt" { resource "aws_subnet" "b" { availability_zone = var.avail_zone - assign_ipv6_address_on_creation = false + assign_ipv6_address_on_creation = true cidr_block = var.vpc_cidr_b depends_on = [ aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.b ] + ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 2) map_public_ip_on_launch = false vpc_id = aws_vpc.CSITVPC.id @@ -113,12 +127,13 @@ resource "aws_subnet" "b" { resource "aws_subnet" "c" { availability_zone = var.avail_zone - assign_ipv6_address_on_creation = false + assign_ipv6_address_on_creation = true cidr_block = var.vpc_cidr_c depends_on = [ aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.c ] + ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 3) map_public_ip_on_launch = false vpc_id = aws_vpc.CSITVPC.id @@ -129,12 +144,13 @@ resource "aws_subnet" "c" { resource "aws_subnet" "d" { availability_zone = var.avail_zone - assign_ipv6_address_on_creation = false + assign_ipv6_address_on_creation = true cidr_block = var.vpc_cidr_d depends_on = [ aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.d ] + ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 4) map_public_ip_on_launch = false vpc_id = aws_vpc.CSITVPC.id @@ -297,9 +313,10 @@ resource "aws_instance" "tg" { vpc_security_group_ids = [aws_security_group.CSITSG.id] # host_id = "1" -# root_block_device { -# volume_size = 50 -# } + root_block_device { + delete_on_termination = true + volume_size = 50 + } tags = { "Name" = "${var.resources_name_prefix}_${var.testbed_name}-tg" @@ -327,9 +344,10 @@ resource "aws_instance" "dut1" { vpc_security_group_ids = [aws_security_group.CSITSG.id] # host_id = "2" -# root_block_device { -# volume_size = 50 -# } + root_block_device { + delete_on_termination = true + volume_size = 50 + } tags = { "Name" = "${var.resources_name_prefix}_${var.testbed_name}-dut1" @@ -343,9 +361,10 @@ resource "aws_route" "CSIT-igw" { aws_vpc.CSITVPC, aws_internet_gateway.CSITGW ] - destination_cidr_block = "0.0.0.0/0" - gateway_id = aws_internet_gateway.CSITGW.id - route_table_id = aws_vpc.CSITVPC.main_route_table_id + destination_cidr_block = "0.0.0.0/0" + destination_ipv6_cidr_block = "::/0" + gateway_id = aws_internet_gateway.CSITGW.id + route_table_id = aws_vpc.CSITVPC.main_route_table_id } resource "aws_route" "dummy-trex-port-0" { diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf index 57c5b69f8e..6263fb46cb 100644 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf +++ b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf @@ -92,16 +92,19 @@ variable "vpc_cidr_mgmt" { type = string default = "192.168.0.0/24" } + variable "vpc_cidr_b" { description = "CIDR block B" type = string default = "192.168.10.0/24" } + variable "vpc_cidr_c" { description = "CIDR block C" type = string default = "200.0.0.0/24" } + variable "vpc_cidr_d" { description = "CIDR block D" type = string @@ -114,6 +117,7 @@ variable "trex_dummy_cidr_port_0" { type = string default = "10.0.0.0/24" } + variable "trex_dummy_cidr_port_1" { description = "TREX dummy CIDR" type = string @@ -126,26 +130,31 @@ variable "tg_if1_ip" { type = string default = "192.168.10.254" } + variable "tg_if2_ip" { description = "TG IP on interface 2" type = string default = "192.168.20.254" } + variable "dut1_if1_ip" { description = "DUT IP on interface 1" type = string default = "192.168.10.11" } + variable "dut1_if2_ip" { description = "DUT IP on interface 1" type = string default = "192.168.20.11" } + variable "tg_mgmt_ip" { description = "TG management interface IP" type = string default = "192.168.0.10" } + variable "dut1_mgmt_ip" { description = "DUT management interface IP" type = string diff --git a/fdio.infra.terraform/2n_aws_c5n/main.tf b/fdio.infra.terraform/2n_aws_c5n/main.tf index 45b597de75..d2e5afdc6a 100644 --- a/fdio.infra.terraform/2n_aws_c5n/main.tf +++ b/fdio.infra.terraform/2n_aws_c5n/main.tf @@ -30,8 +30,8 @@ module "deploy" { dut1_if1_ip = "192.168.10.11" dut1_if2_ip = "192.168.20.11" - trex_dummy_cidr_port_0 = "10.0.0.0/24" - trex_dummy_cidr_port_1 = "20.0.0.0/24" + trex_dummy_cidr_port_0 = "10.0.0.0/16" + trex_dummy_cidr_port_1 = "20.0.0.0/16" # Ansible ansible_python_executable = "/usr/bin/python3" diff --git a/fdio.infra.terraform/3n_aws_c5n/.gitignore b/fdio.infra.terraform/3n_aws_c5n/.gitignore new file mode 100644 index 0000000000..223f2ec48c --- /dev/null +++ b/fdio.infra.terraform/3n_aws_c5n/.gitignore @@ -0,0 +1,36 @@ +# Local .terraform directories +**/.terraform/* + +# .tfstate files +*.tfstate +*.tfstate.* +.terraform.lock.hcl +.terraform.tfstate.lock.info + +# Crash log files +crash.log + +# Exclude all .tfvars files, which are likely to contain sentitive data, such as +# password, private keys, and other secrets. These should not be part of version +# control as they are data points which are potentially sensitive and subject +# to change depending on the environment. +# +*.tfvars + +# Ignore override files as they are usually used to override resources locally and so +# are not checked in +override.tf +override.tf.json +*_override.tf +*_override.tf.json + +# Include override files you do wish to add to version control using negated pattern +# +# !example_override.tf + +# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan +# example: *tfplan* + +# Ignore CLI configuration files +.terraformrc +terraform.rc
\ No newline at end of file diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf index dd994cce0c..188b095b55 100644 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf +++ b/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf @@ -4,7 +4,7 @@ data "vault_aws_access_credentials" "creds" { } resource "aws_vpc" "CSITVPC" { - assign_generated_ipv6_cidr_block = false + assign_generated_ipv6_cidr_block = true enable_dns_hostnames = false enable_dns_support = true cidr_block = var.vpc_cidr_mgmt @@ -30,7 +30,13 @@ resource "aws_security_group" "CSITSG" { to_port = 22 protocol = "tcp" cidr_blocks = ["0.0.0.0/0"] - ipv6_cidr_blocks = [] + } + + ingress { + from_port = 22 + to_port = 22 + protocol = "tcp" + ipv6_cidr_blocks = ["::/0"] } ingress { @@ -38,7 +44,7 @@ resource "aws_security_group" "CSITSG" { to_port = 0 protocol = -1 self = true - ipv6_cidr_blocks = [] + ipv6_cidr_blocks = ["::/0"] } egress { @@ -46,7 +52,13 @@ resource "aws_security_group" "CSITSG" { to_port = 0 protocol = "-1" cidr_blocks = ["0.0.0.0/0"] - ipv6_cidr_blocks = [] + } + + egress { + from_port = 0 + to_port = 0 + protocol = "-1" + ipv6_cidr_blocks = ["::/0"] } tags = { @@ -87,6 +99,7 @@ resource "aws_subnet" "mgmt" { depends_on = [ aws_vpc.CSITVPC ] + ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 1) map_public_ip_on_launch = false vpc_id = aws_vpc.CSITVPC.id @@ -103,6 +116,7 @@ resource "aws_subnet" "b" { aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.b ] + ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 2) map_public_ip_on_launch = false vpc_id = aws_vpc.CSITVPC.id @@ -119,6 +133,7 @@ resource "aws_subnet" "c" { aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.c ] + ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 3) map_public_ip_on_launch = false vpc_id = aws_vpc.CSITVPC.id @@ -135,6 +150,7 @@ resource "aws_subnet" "d" { aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.d ] + ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 4) map_public_ip_on_launch = false vpc_id = aws_vpc.CSITVPC.id @@ -424,9 +440,10 @@ resource "aws_route" "CSIT-igw" { aws_vpc.CSITVPC, aws_internet_gateway.CSITGW ] - destination_cidr_block = "0.0.0.0/0" - gateway_id = aws_internet_gateway.CSITGW.id - route_table_id = aws_vpc.CSITVPC.main_route_table_id + destination_cidr_block = "0.0.0.0/0" + destination_ipv6_cidr_block = "::/0" + gateway_id = aws_internet_gateway.CSITGW.id + route_table_id = aws_vpc.CSITVPC.main_route_table_id } resource "aws_route" "dummy-trex-port-0" { diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf index ffd1a350a1..ca87db759c 100644 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf +++ b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf @@ -92,16 +92,19 @@ variable "vpc_cidr_mgmt" { type = string default = "192.168.0.0/24" } + variable "vpc_cidr_b" { description = "CIDR block B" type = string default = "192.168.10.0/24" } + variable "vpc_cidr_c" { description = "CIDR block C" type = string default = "200.0.0.0/24" } + variable "vpc_cidr_d" { description = "CIDR block D" type = string @@ -114,6 +117,7 @@ variable "trex_dummy_cidr_port_0" { type = string default = "10.0.0.0/24" } + variable "trex_dummy_cidr_port_1" { description = "TREX dummy CIDR" type = string @@ -126,41 +130,49 @@ variable "tg_if1_ip" { type = string default = "192.168.10.254" } + variable "tg_if2_ip" { description = "TG IP on interface 2" type = string default = "192.168.20.254" } + variable "dut1_if1_ip" { description = "DUT IP on interface 1" type = string default = "192.168.10.11" } + variable "dut1_if2_ip" { description = "DUT IP on interface 2" type = string default = "200.0.0.101" } + variable "dut2_if1_ip" { description = "DUT2 IP on interface 1" type = string default = "200.0.0.102" } + variable "dut2_if2_ip" { description = "DUT2 IP on interface 2" type = string default = "192.168.20.11" } + variable "tg_mgmt_ip" { description = "TG management interface IP" type = string default = "192.168.0.10" } + variable "dut1_mgmt_ip" { description = "DUT1 management interface IP" type = string default = "192.168.0.11" } + variable "dut2_mgmt_ip" { description = "DUT2 management interface IP" type = string diff --git a/fdio.infra.terraform/3n_aws_c5n/main.tf b/fdio.infra.terraform/3n_aws_c5n/main.tf index 5ad86015c7..6501b6852e 100644 --- a/fdio.infra.terraform/3n_aws_c5n/main.tf +++ b/fdio.infra.terraform/3n_aws_c5n/main.tf @@ -33,8 +33,8 @@ module "deploy" { dut2_if1_ip = "200.0.0.102" dut2_if2_ip = "192.168.20.11" - trex_dummy_cidr_port_0 = "10.0.0.0/24" - trex_dummy_cidr_port_1 = "20.0.0.0/24" + trex_dummy_cidr_port_0 = "10.0.0.0/16" + trex_dummy_cidr_port_1 = "20.0.0.0/16" # Ansible ansible_python_executable = "/usr/bin/python3" |