diff options
Diffstat (limited to 'fdio.infra.terraform')
73 files changed, 217 insertions, 3981 deletions
diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl index c99d1f5ebc..22b60b3184 100644 --- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl +++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl @@ -10,9 +10,10 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 - port: 22 + port: 6001 username: testuser password: Csit1234 interfaces: diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf index 566a073266..43002d1b8a 100644 --- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf +++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf @@ -38,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-07430bfa17fd4e597" + default = "ami-06ea2ad776e2a8461" } variable "tg_associate_public_ip_address" { @@ -101,14 +101,7 @@ variable "first_run_commands" { description = "List of private IPs to assign to the ENI without regard to order." type = list(string) default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" + "sudo /sbin/shutdown -P +720" ] } diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/main.tf b/fdio.infra.terraform/terraform-aws-1n-c6in/main.tf index 94cac297c2..155cbd6032 100644 --- a/fdio.infra.terraform/terraform-aws-1n-c6in/main.tf +++ b/fdio.infra.terraform/terraform-aws-1n-c6in/main.tf @@ -180,27 +180,32 @@ resource "null_resource" "deploy_tg" { } } +resource "local_file" "topology_file" { + depends_on = [ + aws_instance.tg + ] -resource "null_resource" "deploy_topology" { + content = templatefile( + "${path.module}/topology-${local.topology_name}.tftpl", + { + tg_if1_mac = data.aws_network_interface.tg_if1.mac_address + tg_if2_mac = data.aws_network_interface.tg_if2.mac_address + tg_public_ip = aws_instance.tg.public_ip + } + ) + filename = "${path.module}/../../topologies/available/${local.topology_name}-${local.testbed_name}.yaml" +} + +resource "local_file" "hosts" { depends_on = [ aws_instance.tg ] - provisioner "ansible" { - plays { - playbook { - file_path = var.ansible_topology_path - } - hosts = ["local"] - extra_vars = { - ansible_python_interpreter = local.ansible_python_executable - testbed_name = local.testbed_name - cloud_topology = local.topology_name - tg_if1_mac = data.aws_network_interface.tg_if1.mac_address - tg_if2_mac = data.aws_network_interface.tg_if2.mac_address - tg_public_ip = aws_instance.tg.public_ip - public_ip_list = "${aws_instance.tg.public_ip}" - } + content = templatefile( + "${path.module}/hosts.tftpl", + { + tg_public_ip = aws_instance.tg.public_ip } - } + ) + filename = "${path.module}/../../fdio.infra.ansible/inventories/cloud_inventory/hosts.yaml" }
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl index dc24577bbd..f5eb247687 100644 --- a/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl +++ b/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl @@ -10,9 +10,10 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 - port: 22 + port: 6001 username: testuser password: Csit1234 interfaces: diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf index db0cfa89da..923ae7fb74 100644 --- a/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf +++ b/fdio.infra.terraform/terraform-aws-1n-c6in/variables.tf @@ -38,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-07430bfa17fd4e597" + default = "ami-06ea2ad776e2a8461" } variable "tg_associate_public_ip_address" { @@ -101,14 +101,7 @@ variable "first_run_commands" { description = "List of private IPs to assign to the ENI without regard to order." type = list(string) default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" + "sudo /sbin/shutdown -P +720" ] } diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl index 313b4b3d86..9673380e1d 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl @@ -10,9 +10,10 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 - port: 22 + port: 6001 username: testuser password: Csit1234 interfaces: @@ -30,6 +31,7 @@ nodes: model: Amazon-Nitro-50G DUT1: type: DUT + model: AWS host: ${dut1_public_ip} arch: x86_64 port: 22 diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf index de113166e6..f85ae03dc2 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf @@ -38,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-07430bfa17fd4e597" + default = "ami-06ea2ad776e2a8461" } variable "tg_associate_public_ip_address" { @@ -74,7 +74,7 @@ variable "tg_source_dest_check" { variable "sut1_ami" { description = "AMI to use for the instance." type = string - default = "ami-0a890555652963ec2" + default = "ami-01d325fa583a17daa" } variable "sut1_associate_public_ip_address" { @@ -149,14 +149,7 @@ variable "first_run_commands" { description = "List of private IPs to assign to the ENI without regard to order." type = list(string) default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" + "sudo /sbin/shutdown -P +720" ] } diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/hosts.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6gn/hosts.tftpl deleted file mode 100644 index cb36dbb138..0000000000 --- a/fdio.infra.terraform/terraform-aws-2n-c6gn/hosts.tftpl +++ /dev/null @@ -1,8 +0,0 @@ -all: - children: - tg: - hosts: - ${tg_public_ip} - sut: - hosts: - ${dut1_public_ip}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/main.tf b/fdio.infra.terraform/terraform-aws-2n-c6gn/main.tf deleted file mode 100644 index b3da06ba76..0000000000 --- a/fdio.infra.terraform/terraform-aws-2n-c6gn/main.tf +++ /dev/null @@ -1,335 +0,0 @@ -data "vault_aws_access_credentials" "creds" { - backend = "${var.vault-name}-path" - role = "${var.vault-name}-role" -} - -locals { - ansible_python_executable = "/usr/bin/python3" - availability_zone = "eu-central-1a" - name = "csit-vpc" - environment = "csit-vpc-environment" - key_pair_key_name = "${var.resource_prefix}-${var.testbed_name}-pk" - placement_group_name = "${var.resource_prefix}-${var.testbed_name}-pg" - security_group_name = "${var.resource_prefix}-${var.testbed_name}-sg" - testbed_name = "testbed1" - topology_name = "2n-c6gn" - tg_name = "${var.resource_prefix}-${var.testbed_name}-tg" - sut1_name = "${var.resource_prefix}-${var.testbed_name}-sut1" -} - -# Create VPC -module "vpc" { - source = "../terraform-aws-vpc" - security_group_name = local.security_group_name - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - vpc_enable_dns_hostnames = false -} - -# Create Subnet -module "subnet_b" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.10.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 2) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -module "subnet_d" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.20.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 4) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -# Create Private Key -module "private_key" { - source = "pmikus/private-key/tls" - version = "4.0.4" - - private_key_algorithm = var.private_key_algorithm -} - -# Create Key Pair -module "key_pair" { - source = "pmikus/key-pair/aws" - version = "5.7.0" - - key_pair_key_name = local.key_pair_key_name - key_pair_public_key = module.private_key.public_key_openssh - - key_pair_tags = { - "Environment" = local.environment - } -} - -# Create Placement Group -resource "aws_placement_group" "placement_group" { - name = local.placement_group_name - strategy = var.placement_group_strategy -} - -# Create Instance -resource "aws_instance" "tg" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.tg_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.tg_associate_public_ip_address - instance_initiated_shutdown_behavior = var.tg_instance_initiated_shutdown_behavior - instance_type = var.tg_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.tg_private_ip - source_dest_check = var.tg_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "1" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if1" { - depends_on = [ - module.subnet_b, - aws_instance.tg - ] - private_ip = var.tg_if1_private_ip - private_ips = [var.tg_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 1 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if2" { - depends_on = [ - module.subnet_d, - aws_instance.tg - ] - private_ip = var.tg_if2_private_ip - private_ips = [var.tg_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 2 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "tg_if1" { - id = aws_network_interface.tg_if1.id -} - -data "aws_network_interface" "tg_if2" { - id = aws_network_interface.tg_if2.id -} - -resource "aws_route" "route_tg_if1" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if1 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_route" "route_tg_if2" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if2 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_instance" "sut1" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.sut1_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.sut1_associate_public_ip_address - instance_initiated_shutdown_behavior = var.sut1_instance_initiated_shutdown_behavior - instance_type = var.sut1_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.sut1_private_ip - source_dest_check = var.sut1_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if1" { - depends_on = [ - module.subnet_b, - aws_instance.sut1 - ] - private_ip = var.sut1_if1_private_ip - private_ips = [var.sut1_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 1 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if2" { - depends_on = [ - module.subnet_d, - aws_instance.sut1 - ] - private_ip = var.sut1_if2_private_ip - private_ips = [var.sut1_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 2 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "sut1_if1" { - id = aws_network_interface.sut1_if1.id -} - -data "aws_network_interface" "sut1_if2" { - id = aws_network_interface.sut1_if2.id -} - -resource "null_resource" "deploy_tg" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "null_resource" "deploy_sut1" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.sut1.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "local_file" "topology_file" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1 - ] - - content = templatefile( - "${path.module}/topology-${local.topology_name}.tftpl", - { - tg_if1_mac = data.aws_network_interface.tg_if1.mac_address - tg_if2_mac = data.aws_network_interface.tg_if2.mac_address - dut1_if1_mac = data.aws_network_interface.sut1_if1.mac_address - dut1_if2_mac = data.aws_network_interface.sut1_if2.mac_address - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - } - ) - filename = "${path.module}/../../topologies/available/${local.topology_name}-${local.testbed_name}.yaml" -} - -resource "local_file" "hosts" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1 - ] - - content = templatefile( - "${path.module}/hosts.tftpl", - { - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - } - ) - filename = "${path.module}/../../fdio.infra.ansible/inventories/cloud_inventory/hosts.yaml" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/output.tf b/fdio.infra.terraform/terraform-aws-2n-c6gn/output.tf deleted file mode 100644 index e69de29bb2..0000000000 --- a/fdio.infra.terraform/terraform-aws-2n-c6gn/output.tf +++ /dev/null diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/providers.tf b/fdio.infra.terraform/terraform-aws-2n-c6gn/providers.tf deleted file mode 100644 index 1a98cb50df..0000000000 --- a/fdio.infra.terraform/terraform-aws-2n-c6gn/providers.tf +++ /dev/null @@ -1,11 +0,0 @@ -provider "aws" { - region = var.region - access_key = data.vault_aws_access_credentials.creds.access_key - secret_key = data.vault_aws_access_credentials.creds.secret_key -} - -provider "vault" { - address = "http://vault.service.consul:8200" - skip_tls_verify = true - token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl deleted file mode 100644 index a0fa5fc191..0000000000 --- a/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl +++ /dev/null @@ -1,51 +0,0 @@ ---- -metadata: - version: 0.1 - schema: - - resources/topology_schemas/2_node_topology.sch.yaml - - resources/topology_schemas/topology.sch.yaml - tags: [hw, 2-node] - -nodes: - TG: - type: TG - subtype: TREX - host: "${tg_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - interfaces: - port1: - # tg_instance/p1 - 100GE port1 on ENA NIC. - mac_address: "${tg_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-100G - port2: - # tg_instance/p2 - 100GE port2 on ENA NIC. - mac_address: "${tg_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-100G - DUT1: - type: DUT - host: "${dut1_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut1_instance/p1 - 100GE port1 on ENA NIC. - mac_address: "${dut1_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-100G - port2: - # dut1_instance/p2 - 100GE port2 on ENA NIC. - mac_address: "${dut1_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-100G
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c6gn/variables.tf deleted file mode 100644 index fec833126d..0000000000 --- a/fdio.infra.terraform/terraform-aws-2n-c6gn/variables.tf +++ /dev/null @@ -1,180 +0,0 @@ -variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio-csit-jenkins" -} - -variable "region" { - description = "AWS Region." - type = string - default = "eu-central-1" -} - -variable "resource_prefix" { - description = "Resources name prefix." - type = string - default = "csit-2n-c6gn" -} - -variable "testbed_name" { - description = "Testbed name." - type = string - default = "testbed1" -} - -# Variables for Private Key -variable "private_key_algorithm" { - description = "The name of the algorithm to use for the key." - type = string - default = "RSA" -} - -variable "private_key_ecdsa_curve" { - description = "When algorithm is ECDSA, the name of the elliptic curve to use." - type = string - default = "P521" -} - -variable "private_key_rsa_bits" { - description = "When algorithm is RSA, the size of the generated RSA key in bits." - type = number - default = 4096 -} - -# Variables for Placement Group -variable "placement_group_strategy" { - description = "The placement strategy. Can be cluster, partition or spread." - type = string - default = "cluster" -} - -# Variables for Instance -variable "tg_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-07430bfa17fd4e597" -} - -variable "tg_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "tg_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "tg_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c6in.4xlarge" -} - -variable "tg_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.10" -} - -variable "tg_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -variable "sut1_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-0cebabdc14ee56909" -} - -variable "sut1_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "sut1_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "sut1_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c6gn.4xlarge" -} - -variable "sut1_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.11" -} - -variable "sut1_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -# Variables for Network Interface -variable "tg_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.254" -} - -variable "tg_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.254" -} - -variable "destination_cidr_block_tg_if1" { - description = "The destination CIDR block." - type = string - default = "10.0.0.0/24" -} - -variable "destination_cidr_block_tg_if2" { - description = "The destination CIDR block." - type = string - default = "20.0.0.0/24" -} - -variable "sut1_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.11" -} - -variable "sut1_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.11" -} - -# Variables for Null Resource -variable "first_run_commands" { - description = "List of private IPs to assign to the ENI without regard to order." - type = list(string) - default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" - ] -} - -# Variables for Null Resource -variable "ansible_topology_path" { - description = "Ansible topology path." - type = string - default = "../../fdio.infra.ansible/cloud_topology.yaml" -} diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/versions.tf b/fdio.infra.terraform/terraform-aws-2n-c6gn/versions.tf deleted file mode 100644 index 589699691e..0000000000 --- a/fdio.infra.terraform/terraform-aws-2n-c6gn/versions.tf +++ /dev/null @@ -1,20 +0,0 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = ">= 5.7.0" - } - null = { - source = "hashicorp/null" - version = ">= 3.2.1" - } - tls = { - source = "hashicorp/tls" - version = ">= 4.0.4" - } - vault = { - version = ">= 3.15.2" - } - } - required_version = ">= 1.4.2" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl index d012d335b6..cfef304b2c 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl +++ b/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl @@ -10,9 +10,10 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 - port: 22 + port: 6001 username: testuser password: Csit1234 interfaces: @@ -30,6 +31,7 @@ nodes: model: Amazon-Nitro-200G DUT1: type: DUT + model: AWS host: ${dut1_public_ip} arch: x86_64 port: 22 diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf index 4835b7afba..fea82b0a5c 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf @@ -50,7 +50,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-0285a978d8bd77dcb" + default = "ami-06ea2ad776e2a8461" } variable "tg_associate_public_ip_address" { @@ -86,7 +86,7 @@ variable "tg_source_dest_check" { variable "sut1_ami" { description = "AMI to use for the instance." type = string - default = "ami-0f3ecd7f56fc232bd" + default = "ami-01d325fa583a17daa" } variable "sut1_associate_public_ip_address" { @@ -161,8 +161,8 @@ variable "first_run_commands" { description = "List of private IPs to assign to the ENI without regard to order." type = list(string) default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", + "sudo sed -i 's/^PasswordAuthentication no/PasswordAuthentication yes/' /etc/ssh/sshd_config", + "sudo systemctl restart ssh.service", "sudo useradd --create-home -s /bin/bash provisionuser", "echo 'provisionuser:Csit1234' | sudo chpasswd", "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl b/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl index a0fa5fc191..50a61ccb99 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl +++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl @@ -10,9 +10,10 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 - port: 22 + port: 6001 username: testuser password: Csit1234 interfaces: @@ -30,6 +31,7 @@ nodes: model: Amazon-Nitro-100G DUT1: type: DUT + model: AWS host: "${dut1_public_ip}" arch: x86_64 port: 22 diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf index 1b9d375c24..891b2054c0 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf @@ -38,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-0243e38bc8ac1f8a3" + default = "ami-09a82dc14ad8658ce" } variable "tg_associate_public_ip_address" { @@ -74,7 +74,7 @@ variable "tg_source_dest_check" { variable "sut1_ami" { description = "AMI to use for the instance." type = string - default = "ami-0c0f39556bbb626b2" + default = "ami-0f79fc4ee6157a1b4" } variable "sut1_associate_public_ip_address" { @@ -149,14 +149,7 @@ variable "first_run_commands" { description = "List of private IPs to assign to the ENI without regard to order." type = list(string) default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" + "sudo /sbin/shutdown -P +720" ] } diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/hosts.tftpl b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/hosts.tftpl deleted file mode 100644 index e88c8ba510..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/hosts.tftpl +++ /dev/null @@ -1,9 +0,0 @@ -all: - children: - tg: - hosts: - ${tg_public_ip} - sut: - hosts: - ${dut1_public_ip} - ${dut2_public_ip}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/main.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/main.tf deleted file mode 100644 index c95c8a6588..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/main.tf +++ /dev/null @@ -1,457 +0,0 @@ -data "vault_aws_access_credentials" "creds" { - backend = "${var.vault-name}-path" - role = "${var.vault-name}-role" -} - -locals { - ansible_python_executable = "/usr/bin/python3" - availability_zone = "eu-central-1a" - name = "csit-vpc" - environment = "csit-vpc-environment" - key_pair_key_name = "${var.resource_prefix}-${var.testbed_name}-pk" - placement_group_name = "${var.resource_prefix}-${var.testbed_name}-pg" - security_group_name = "${var.resource_prefix}-${var.testbed_name}-sg" - testbed_name = "testbed1" - topology_name = "3n-aws-c5n" - tg_name = "${var.resource_prefix}-${var.testbed_name}-tg" - sut1_name = "${var.resource_prefix}-${var.testbed_name}-sut1" - sut2_name = "${var.resource_prefix}-${var.testbed_name}-sut2" -} - -# Create VPC -module "vpc" { - source = "../terraform-aws-vpc" - security_group_name = local.security_group_name - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment -} - -# Create Subnet -module "subnet_b" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.10.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 2) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -module "subnet_c" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "200.0.0.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 3) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -module "subnet_d" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.20.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 4) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -# Create Private Key -module "private_key" { - source = "pmikus/private-key/tls" - version = "4.0.4" - - private_key_algorithm = var.private_key_algorithm -} - -# Create Key Pair -module "key_pair" { - source = "pmikus/key-pair/aws" - version = "5.7.0" - - key_pair_key_name = local.key_pair_key_name - key_pair_public_key = module.private_key.public_key_openssh - - key_pair_tags = { - "Environment" = local.environment - } -} - -# Create Placement Group -resource "aws_placement_group" "placement_group" { - name = local.placement_group_name - strategy = var.placement_group_strategy -} - -# Create Instance -resource "aws_instance" "tg" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.tg_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.tg_associate_public_ip_address - instance_initiated_shutdown_behavior = var.tg_instance_initiated_shutdown_behavior - instance_type = var.tg_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.tg_private_ip - source_dest_check = var.tg_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "1" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if1" { - depends_on = [ - module.subnet_b, - aws_instance.tg - ] - private_ip = var.tg_if1_private_ip - private_ips = [var.tg_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 1 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if2" { - depends_on = [ - module.subnet_d, - aws_instance.tg - ] - private_ips = [var.tg_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 2 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "tg_if1" { - id = aws_network_interface.tg_if1.id -} - -data "aws_network_interface" "tg_if2" { - id = aws_network_interface.tg_if2.id -} - -resource "aws_route" "route_tg_if1" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if1 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_route" "route_tg_if2" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if2 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_instance" "sut1" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.sut1_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.sut1_associate_public_ip_address - instance_initiated_shutdown_behavior = var.sut1_instance_initiated_shutdown_behavior - instance_type = var.sut1_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.sut1_private_ip - source_dest_check = var.sut1_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if1" { - depends_on = [ - module.subnet_b, - aws_instance.sut1 - ] - private_ips = [var.sut1_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 1 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if2" { - depends_on = [ - module.subnet_c, - aws_instance.sut1 - ] - private_ips = [var.sut1_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_c.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 2 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "sut1_if1" { - id = aws_network_interface.sut1_if1.id -} - -data "aws_network_interface" "sut1_if2" { - id = aws_network_interface.sut1_if2.id -} - -resource "aws_instance" "sut2" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.sut2_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.sut2_associate_public_ip_address - instance_initiated_shutdown_behavior = var.sut2_instance_initiated_shutdown_behavior - instance_type = var.sut2_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.sut2_private_ip - source_dest_check = var.sut2_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut2_if1" { - depends_on = [ - module.subnet_c, - aws_instance.sut2 - ] - private_ips = [var.sut2_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut2_source_dest_check - subnet_id = module.subnet_c.subnet_id - - attachment { - instance = aws_instance.sut2.id - device_index = 1 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut2_if2" { - depends_on = [ - module.subnet_d, - aws_instance.sut2 - ] - private_ips = [var.sut2_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut2_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.sut2.id - device_index = 2 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "sut2_if1" { - id = aws_network_interface.sut2_if1.id -} - -data "aws_network_interface" "sut2_if2" { - id = aws_network_interface.sut2_if2.id -} - -resource "null_resource" "deploy_tg" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "null_resource" "deploy_sut1" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.sut1.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "null_resource" "deploy_sut2" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.sut2.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "local_file" "topology_file" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1, - aws_instance.sut2 - ] - - content = templatefile( - "${path.module}/topology-${local.topology_name}.tftpl", - { - tg_if1_mac = data.aws_network_interface.tg_if1.mac_address - tg_if2_mac = data.aws_network_interface.tg_if2.mac_address - dut1_if1_mac = data.aws_network_interface.sut1_if1.mac_address - dut1_if2_mac = data.aws_network_interface.sut1_if2.mac_address - dut2_if1_mac = data.aws_network_interface.sut2_if1.mac_address - dut2_if2_mac = data.aws_network_interface.sut2_if2.mac_address - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - dut2_public_ip = aws_instance.sut2.public_ip - } - ) - filename = "${path.module}/../../topologies/available/${local.topology_name}-${local.testbed_name}.yaml" -} - -resource "local_file" "hosts" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1, - aws_instance.sut2 - ] - - content = templatefile( - "${path.module}/hosts.tftpl", - { - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - dut2_public_ip = aws_instance.sut2.public_ip - } - ) - filename = "${path.module}/../../fdio.infra.ansible/inventories/cloud_inventory/hosts.yaml" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/output.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/output.tf deleted file mode 100644 index e69de29bb2..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/output.tf +++ /dev/null diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf deleted file mode 100644 index 485f0ebe30..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf +++ /dev/null @@ -1,11 +0,0 @@ -provider "aws" { - region = var.region - access_key = data.vault_aws_access_credentials.creds.access_key - secret_key = data.vault_aws_access_credentials.creds.secret_key -} - -provider "vault" { - address = "http://10.30.51.24:8200" - skip_tls_verify = true - token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl deleted file mode 100644 index 9886b56a8d..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl +++ /dev/null @@ -1,72 +0,0 @@ ---- -metadata: - version: 0.1 - schema: - - resources/topology_schemas/3_node_topology.sch.yaml - - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] - -nodes: - TG: - type: TG - subtype: TREX - host: "${tg_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - interfaces: - port1: - # tg_instance/p1 - 50GE port1 on ENA NIC. - mac_address: "${tg_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-50G - port2: - # tg_instance/p2 - 50GE port2 on ENA NIC. - mac_address: "${tg_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-50G - DUT1: - type: DUT - host: ${dut1_public_ip} - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut1_instance/p1 - 50GE port1 on ENA NIC. - mac_address: "${dut1_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-50G - port2: - # dut1_instance/p2 - 50GE port2 on ENA NIC. - mac_address: "${dut1_if2_mac}" - pci_address: "0000:00:07.0" - link: link21 - model: Amazon-Nitro-50G - DUT2: - type: DUT - host: ${dut2_public_ip} - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut2_instance/p1 - 50GE port1 on ENA NIC. - mac_address: "${dut2_if1_mac}" - pci_address: "0000:00:06.0" - link: link21 - model: Amazon-Nitro-50G - port2: - # dut2_instance/p2 - 50GE port1 on ENA NIC. - mac_address: "${dut2_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-50G
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf deleted file mode 100644 index d64dd5b241..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf +++ /dev/null @@ -1,216 +0,0 @@ -variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio-csit-jenkins" -} - -variable "region" { - description = "AWS Region." - type = string - default = "eu-central-1" -} - -variable "resource_prefix" { - description = "Resources name prefix." - type = string - default = "csit-3n-aws-c5n" -} - -variable "testbed_name" { - description = "Testbed name." - type = string - default = "testbed1" -} - -# Variables for Private Key -variable "private_key_algorithm" { - description = "The name of the algorithm to use for the key." - type = string - default = "ED25519" -} - -# Variables for Placement Group -variable "placement_group_strategy" { - description = "The placement strategy. Can be cluster, partition or spread." - type = string - default = "cluster" -} - -# Variables for Instance -variable "tg_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-07430bfa17fd4e597" -} - -variable "tg_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "tg_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "tg_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c5n.4xlarge" -} - -variable "tg_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.10" -} - -variable "tg_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -variable "sut1_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-0a890555652963ec2" -} - -variable "sut1_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "sut1_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "sut1_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c5n.4xlarge" -} - -variable "sut1_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.11" -} - -variable "sut1_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -variable "sut2_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-07898402cb1fd6561" -} - -variable "sut2_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "sut2_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "sut2_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c5n.4xlarge" -} - -variable "sut2_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.12" -} - -variable "sut2_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -# Variables for Network Interface -variable "tg_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.254" -} - -variable "tg_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.254" -} - -variable "destination_cidr_block_tg_if1" { - description = "The destination CIDR block." - type = string - default = "10.0.0.0/24" -} - -variable "destination_cidr_block_tg_if2" { - description = "The destination CIDR block." - type = string - default = "20.0.0.0/24" -} - -variable "sut1_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.11" -} - -variable "sut1_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "200.0.0.101" -} - -variable "sut2_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "200.0.0.102" -} - -variable "sut2_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.11" -} - -# Variables for Null Resource -variable "first_run_commands" { - description = "List of private IPs to assign to the ENI without regard to order." - type = list(string) - default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" - ] -} - -# Variables for Null Resource -variable "ansible_topology_path" { - description = "Ansible topology path." - type = string - default = "../../fdio.infra.ansible/cloud_topology.yaml" -} diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/versions.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/versions.tf deleted file mode 100644 index 589699691e..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/versions.tf +++ /dev/null @@ -1,20 +0,0 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = ">= 5.7.0" - } - null = { - source = "hashicorp/null" - version = ">= 3.2.1" - } - tls = { - source = "hashicorp/tls" - version = ">= 4.0.4" - } - vault = { - version = ">= 3.15.2" - } - } - required_version = ">= 1.4.2" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/hosts.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6gn/hosts.tftpl deleted file mode 100644 index e88c8ba510..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6gn/hosts.tftpl +++ /dev/null @@ -1,9 +0,0 @@ -all: - children: - tg: - hosts: - ${tg_public_ip} - sut: - hosts: - ${dut1_public_ip} - ${dut2_public_ip}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/main.tf b/fdio.infra.terraform/terraform-aws-3n-c6gn/main.tf deleted file mode 100644 index dc0ad6a210..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6gn/main.tf +++ /dev/null @@ -1,457 +0,0 @@ -data "vault_aws_access_credentials" "creds" { - backend = "${var.vault-name}-path" - role = "${var.vault-name}-role" -} - -locals { - ansible_python_executable = "/usr/bin/python3" - availability_zone = "eu-central-1a" - name = "csit-vpc" - environment = "csit-vpc-environment" - key_pair_key_name = "${var.resource_prefix}-${var.testbed_name}-pk" - placement_group_name = "${var.resource_prefix}-${var.testbed_name}-pg" - security_group_name = "${var.resource_prefix}-${var.testbed_name}-sg" - testbed_name = "testbed1" - topology_name = "3n-c6gn" - tg_name = "${var.resource_prefix}-${var.testbed_name}-tg" - sut1_name = "${var.resource_prefix}-${var.testbed_name}-sut1" - sut2_name = "${var.resource_prefix}-${var.testbed_name}-sut2" -} - -# Create VPC -module "vpc" { - source = "../terraform-aws-vpc" - security_group_name = local.security_group_name - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment -} - -# Create Subnet -module "subnet_b" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.10.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 2) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -module "subnet_c" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "200.0.0.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 3) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -module "subnet_d" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.20.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 4) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -# Create Private Key -module "private_key" { - source = "pmikus/private-key/tls" - version = "4.0.4" - - private_key_algorithm = var.private_key_algorithm -} - -# Create Key Pair -module "key_pair" { - source = "pmikus/key-pair/aws" - version = "5.7.0" - - key_pair_key_name = local.key_pair_key_name - key_pair_public_key = module.private_key.public_key_openssh - - key_pair_tags = { - "Environment" = local.environment - } -} - -# Create Placement Group -resource "aws_placement_group" "placement_group" { - name = local.placement_group_name - strategy = var.placement_group_strategy -} - -# Create Instance -resource "aws_instance" "tg" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.tg_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.tg_associate_public_ip_address - instance_initiated_shutdown_behavior = var.tg_instance_initiated_shutdown_behavior - instance_type = var.tg_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.tg_private_ip - source_dest_check = var.tg_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "1" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if1" { - depends_on = [ - module.subnet_b, - aws_instance.tg - ] - private_ip = var.tg_if1_private_ip - private_ips = [var.tg_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 1 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if2" { - depends_on = [ - module.subnet_d, - aws_instance.tg - ] - private_ips = [var.tg_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 2 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "tg_if1" { - id = aws_network_interface.tg_if1.id -} - -data "aws_network_interface" "tg_if2" { - id = aws_network_interface.tg_if2.id -} - -resource "aws_route" "route_tg_if1" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if1 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_route" "route_tg_if2" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if2 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_instance" "sut1" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.sut1_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.sut1_associate_public_ip_address - instance_initiated_shutdown_behavior = var.sut1_instance_initiated_shutdown_behavior - instance_type = var.sut1_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.sut1_private_ip - source_dest_check = var.sut1_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if1" { - depends_on = [ - module.subnet_b, - aws_instance.sut1 - ] - private_ips = [var.sut1_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 1 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if2" { - depends_on = [ - module.subnet_c, - aws_instance.sut1 - ] - private_ips = [var.sut1_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_c.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 2 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "sut1_if1" { - id = aws_network_interface.sut1_if1.id -} - -data "aws_network_interface" "sut1_if2" { - id = aws_network_interface.sut1_if2.id -} - -resource "aws_instance" "sut2" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.sut2_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.sut2_associate_public_ip_address - instance_initiated_shutdown_behavior = var.sut2_instance_initiated_shutdown_behavior - instance_type = var.sut2_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.sut2_private_ip - source_dest_check = var.sut2_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut2_if1" { - depends_on = [ - module.subnet_c, - aws_instance.sut2 - ] - private_ips = [var.sut2_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut2_source_dest_check - subnet_id = module.subnet_c.subnet_id - - attachment { - instance = aws_instance.sut2.id - device_index = 1 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut2_if2" { - depends_on = [ - module.subnet_d, - aws_instance.sut2 - ] - private_ips = [var.sut2_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut2_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.sut2.id - device_index = 2 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "sut2_if1" { - id = aws_network_interface.sut2_if1.id -} - -data "aws_network_interface" "sut2_if2" { - id = aws_network_interface.sut2_if2.id -} - -resource "null_resource" "deploy_tg" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "null_resource" "deploy_sut1" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.sut1.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "null_resource" "deploy_sut2" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.sut2.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "local_file" "topology_file" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1, - aws_instance.sut2 - ] - - content = templatefile( - "${path.module}/topology-${local.topology_name}.tftpl", - { - tg_if1_mac = data.aws_network_interface.tg_if1.mac_address - tg_if2_mac = data.aws_network_interface.tg_if2.mac_address - dut1_if1_mac = data.aws_network_interface.sut1_if1.mac_address - dut1_if2_mac = data.aws_network_interface.sut1_if2.mac_address - dut2_if1_mac = data.aws_network_interface.sut2_if1.mac_address - dut2_if2_mac = data.aws_network_interface.sut2_if2.mac_address - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - dut2_public_ip = aws_instance.sut2.public_ip - } - ) - filename = "${path.module}/../../topologies/available/${local.topology_name}-${local.testbed_name}.yaml" -} - -resource "local_file" "hosts" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1, - aws_instance.sut2 - ] - - content = templatefile( - "${path.module}/hosts.tftpl", - { - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - dut2_public_ip = aws_instance.sut2.public_ip - } - ) - filename = "${path.module}/../../fdio.infra.ansible/inventories/cloud_inventory/hosts.yaml" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/output.tf b/fdio.infra.terraform/terraform-aws-3n-c6gn/output.tf deleted file mode 100644 index e69de29bb2..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6gn/output.tf +++ /dev/null diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/providers.tf b/fdio.infra.terraform/terraform-aws-3n-c6gn/providers.tf deleted file mode 100644 index 485f0ebe30..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6gn/providers.tf +++ /dev/null @@ -1,11 +0,0 @@ -provider "aws" { - region = var.region - access_key = data.vault_aws_access_credentials.creds.access_key - secret_key = data.vault_aws_access_credentials.creds.secret_key -} - -provider "vault" { - address = "http://10.30.51.24:8200" - skip_tls_verify = true - token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl deleted file mode 100644 index dc6d869a02..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl +++ /dev/null @@ -1,73 +0,0 @@ ---- -metadata: - version: 0.1 - schema: - - resources/topology_schemas/3_node_topology.sch.yaml - - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] - -nodes: - TG: - type: TG - subtype: TREX - host: "${tg_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - interfaces: - port1: - # tg_instance/p1 - 100GE port1 on ENA NIC. - mac_address: "${tg_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-100G - port2: - # tg_instance/p2 - 100GE port2 on ENA NIC. - mac_address: "${tg_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-100G - DUT1: - type: DUT - host: "${dut1_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut1_instance/p1 - 100GE port1 on ENA NIC. - mac_address: "${dut1_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-100G - port2: - # dut1_instance/p2 - 100GE port2 on ENA NIC. - mac_address: "${dut1_if2_mac}" - pci_address: "0000:00:07.0" - link: link21 - model: Amazon-Nitro-100G - DUT2: - type: DUT - host: "${dut2_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut2_instance/p1 - 100GE port1 on ENA NIC. - mac_address: "${dut2_if1_mac}" - pci_address: "0000:00:06.0" - link: link21 - model: Amazon-Nitro-100G - port2: - # dut2_instance/p2 - 100GE port1 on ENA NIC. - mac_address: "${dut2_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-100G - diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/variables.tf b/fdio.infra.terraform/terraform-aws-3n-c6gn/variables.tf deleted file mode 100644 index 23ae7cf42a..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6gn/variables.tf +++ /dev/null @@ -1,216 +0,0 @@ -variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio-csit-jenkins" -} - -variable "region" { - description = "AWS Region." - type = string - default = "eu-central-1" -} - -variable "resource_prefix" { - description = "Resources name prefix." - type = string - default = "csit-3n-c6gn" -} - -variable "testbed_name" { - description = "Testbed name." - type = string - default = "testbed1" -} - -# Variables for Private Key -variable "private_key_algorithm" { - description = "The name of the algorithm to use for the key." - type = string - default = "ED25519" -} - -# Variables for Placement Group -variable "placement_group_strategy" { - description = "The placement strategy. Can be cluster, partition or spread." - type = string - default = "cluster" -} - -# Variables for Instance -variable "tg_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-07430bfa17fd4e597" -} - -variable "tg_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "tg_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "tg_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c6in.4xlarge" -} - -variable "tg_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.10" -} - -variable "tg_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -variable "sut1_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-0cebabdc14ee56909" -} - -variable "sut1_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "sut1_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "sut1_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c6gn.4xlarge" -} - -variable "sut1_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.11" -} - -variable "sut1_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -variable "sut2_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-0cebabdc14ee56909" -} - -variable "sut2_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "sut2_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "sut2_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c6gn.4xlarge" -} - -variable "sut2_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.12" -} - -variable "sut2_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -# Variables for Network Interface -variable "tg_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.254" -} - -variable "tg_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.254" -} - -variable "destination_cidr_block_tg_if1" { - description = "The destination CIDR block." - type = string - default = "10.0.0.0/24" -} - -variable "destination_cidr_block_tg_if2" { - description = "The destination CIDR block." - type = string - default = "20.0.0.0/24" -} - -variable "sut1_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.11" -} - -variable "sut1_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "200.0.0.101" -} - -variable "sut2_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "200.0.0.102" -} - -variable "sut2_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.11" -} - -# Variables for Null Resource -variable "first_run_commands" { - description = "List of private IPs to assign to the ENI without regard to order." - type = list(string) - default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" - ] -} - -# Variables for Null Resource -variable "ansible_topology_path" { - description = "Ansible topology path." - type = string - default = "../../fdio.infra.ansible/cloud_topology.yaml" -} diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/versions.tf b/fdio.infra.terraform/terraform-aws-3n-c6gn/versions.tf deleted file mode 100644 index 589699691e..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6gn/versions.tf +++ /dev/null @@ -1,20 +0,0 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = ">= 5.7.0" - } - null = { - source = "hashicorp/null" - version = ">= 3.2.1" - } - tls = { - source = "hashicorp/tls" - version = ">= 4.0.4" - } - vault = { - version = ">= 3.15.2" - } - } - required_version = ">= 1.4.2" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/hosts.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6in/hosts.tftpl deleted file mode 100644 index e88c8ba510..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6in/hosts.tftpl +++ /dev/null @@ -1,9 +0,0 @@ -all: - children: - tg: - hosts: - ${tg_public_ip} - sut: - hosts: - ${dut1_public_ip} - ${dut2_public_ip}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/main.tf b/fdio.infra.terraform/terraform-aws-3n-c6in/main.tf deleted file mode 100644 index f1bb1b0f03..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6in/main.tf +++ /dev/null @@ -1,457 +0,0 @@ -data "vault_aws_access_credentials" "creds" { - backend = "${var.vault-name}-path" - role = "${var.vault-name}-role" -} - -locals { - ansible_python_executable = "/usr/bin/python3" - availability_zone = "eu-central-1b" - name = "csit-vpc" - environment = "csit-vpc-environment" - key_pair_key_name = "${var.resource_prefix}-${var.testbed_name}-pk" - placement_group_name = "${var.resource_prefix}-${var.testbed_name}-pg" - security_group_name = "${var.resource_prefix}-${var.testbed_name}-sg" - testbed_name = "testbed1" - topology_name = "3n-c6in" - tg_name = "${var.resource_prefix}-${var.testbed_name}-tg" - sut1_name = "${var.resource_prefix}-${var.testbed_name}-sut1" - sut2_name = "${var.resource_prefix}-${var.testbed_name}-sut2" -} - -# Create VPC -module "vpc" { - source = "../terraform-aws-vpc" - security_group_name = local.security_group_name - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment -} - -# Create Subnet -module "subnet_b" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.10.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 2) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -module "subnet_c" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "200.0.0.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 3) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -module "subnet_d" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.20.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 4) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -# Create Private Key -module "private_key" { - source = "pmikus/private-key/tls" - version = "4.0.4" - - private_key_algorithm = var.private_key_algorithm -} - -# Create Key Pair -module "key_pair" { - source = "pmikus/key-pair/aws" - version = "5.7.0" - - key_pair_key_name = local.key_pair_key_name - key_pair_public_key = module.private_key.public_key_openssh - - key_pair_tags = { - "Environment" = local.environment - } -} - -# Create Placement Group -resource "aws_placement_group" "placement_group" { - name = local.placement_group_name - strategy = var.placement_group_strategy -} - -# Create Instance -resource "aws_instance" "tg" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.tg_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.tg_associate_public_ip_address - instance_initiated_shutdown_behavior = var.tg_instance_initiated_shutdown_behavior - instance_type = var.tg_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.tg_private_ip - source_dest_check = var.tg_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "1" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if1" { - depends_on = [ - module.subnet_b, - aws_instance.tg - ] - private_ip = var.tg_if1_private_ip - private_ips = [var.tg_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 1 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if2" { - depends_on = [ - module.subnet_d, - aws_instance.tg - ] - private_ips = [var.tg_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 2 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "tg_if1" { - id = aws_network_interface.tg_if1.id -} - -data "aws_network_interface" "tg_if2" { - id = aws_network_interface.tg_if2.id -} - -resource "aws_route" "route_tg_if1" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if1 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_route" "route_tg_if2" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if2 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_instance" "sut1" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.sut1_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.sut1_associate_public_ip_address - instance_initiated_shutdown_behavior = var.sut1_instance_initiated_shutdown_behavior - instance_type = var.sut1_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.sut1_private_ip - source_dest_check = var.sut1_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if1" { - depends_on = [ - module.subnet_b, - aws_instance.sut1 - ] - private_ips = [var.sut1_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 1 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if2" { - depends_on = [ - module.subnet_c, - aws_instance.sut1 - ] - private_ips = [var.sut1_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_c.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 2 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "sut1_if1" { - id = aws_network_interface.sut1_if1.id -} - -data "aws_network_interface" "sut1_if2" { - id = aws_network_interface.sut1_if2.id -} - -resource "aws_instance" "sut2" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.sut2_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.sut2_associate_public_ip_address - instance_initiated_shutdown_behavior = var.sut2_instance_initiated_shutdown_behavior - instance_type = var.sut2_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.sut2_private_ip - source_dest_check = var.sut2_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut2_if1" { - depends_on = [ - module.subnet_c, - aws_instance.sut2 - ] - private_ips = [var.sut2_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut2_source_dest_check - subnet_id = module.subnet_c.subnet_id - - attachment { - instance = aws_instance.sut2.id - device_index = 1 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut2_if2" { - depends_on = [ - module.subnet_d, - aws_instance.sut2 - ] - private_ips = [var.sut2_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut2_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.sut2.id - device_index = 2 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "sut2_if1" { - id = aws_network_interface.sut2_if1.id -} - -data "aws_network_interface" "sut2_if2" { - id = aws_network_interface.sut2_if2.id -} - -resource "null_resource" "deploy_tg" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "null_resource" "deploy_sut1" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.sut1.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "null_resource" "deploy_sut2" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.sut2.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "local_file" "topology_file" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1, - aws_instance.sut2 - ] - - content = templatefile( - "${path.module}/topology-${local.topology_name}.tftpl", - { - tg_if1_mac = data.aws_network_interface.tg_if1.mac_address - tg_if2_mac = data.aws_network_interface.tg_if2.mac_address - dut1_if1_mac = data.aws_network_interface.sut1_if1.mac_address - dut1_if2_mac = data.aws_network_interface.sut1_if2.mac_address - dut2_if1_mac = data.aws_network_interface.sut2_if1.mac_address - dut2_if2_mac = data.aws_network_interface.sut2_if2.mac_address - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - dut2_public_ip = aws_instance.sut2.public_ip - } - ) - filename = "${path.module}/../../topologies/available/${local.topology_name}-${local.testbed_name}.yaml" -} - -resource "local_file" "hosts" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1, - aws_instance.sut2 - ] - - content = templatefile( - "${path.module}/hosts.tftpl", - { - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - dut2_public_ip = aws_instance.sut2.public_ip - } - ) - filename = "${path.module}/../../fdio.infra.ansible/inventories/cloud_inventory/hosts.yaml" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/output.tf b/fdio.infra.terraform/terraform-aws-3n-c6in/output.tf deleted file mode 100644 index e69de29bb2..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6in/output.tf +++ /dev/null diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/providers.tf b/fdio.infra.terraform/terraform-aws-3n-c6in/providers.tf deleted file mode 100644 index 485f0ebe30..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6in/providers.tf +++ /dev/null @@ -1,11 +0,0 @@ -provider "aws" { - region = var.region - access_key = data.vault_aws_access_credentials.creds.access_key - secret_key = data.vault_aws_access_credentials.creds.secret_key -} - -provider "vault" { - address = "http://10.30.51.24:8200" - skip_tls_verify = true - token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl deleted file mode 100644 index 2ec39d0ea9..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl +++ /dev/null @@ -1,73 +0,0 @@ ---- -metadata: - version: 0.1 - schema: - - resources/topology_schemas/3_node_topology.sch.yaml - - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] - -nodes: - TG: - type: TG - subtype: TREX - host: "${tg_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - interfaces: - port1: - # tg_instance/p1 - 200GE port1 on ENA NIC. - mac_address: "${tg_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-200G - port2: - # tg_instance/p2 - 200GE port2 on ENA NIC. - mac_address: "${tg_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-200G - DUT1: - type: DUT - host: "${dut1_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut1_instance/p1 - 200GE port1 on ENA NIC. - mac_address: "${dut1_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-200G - port2: - # dut1_instance/p2 - 200GE port2 on ENA NIC. - mac_address: "${dut1_if2_mac}" - pci_address: "0000:00:07.0" - link: link21 - model: Amazon-Nitro-200G - DUT2: - type: DUT - host: "${dut2_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut2_instance/p1 - 200GE port1 on ENA NIC. - mac_address: "${dut2_if1_mac}" - pci_address: "0000:00:06.0" - link: link21 - model: Amazon-Nitro-200G - port2: - # dut2_instance/p2 - 200GE port1 on ENA NIC. - mac_address: "${dut2_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-200G - diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-3n-c6in/variables.tf deleted file mode 100644 index 084a9da390..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6in/variables.tf +++ /dev/null @@ -1,216 +0,0 @@ -variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio-csit-jenkins" -} - -variable "region" { - description = "AWS Region." - type = string - default = "eu-central-1" -} - -variable "resource_prefix" { - description = "Resources name prefix." - type = string - default = "csit-3n-c6in" -} - -variable "testbed_name" { - description = "Testbed name." - type = string - default = "testbed1" -} - -# Variables for Private Key -variable "private_key_algorithm" { - description = "The name of the algorithm to use for the key." - type = string - default = "ED25519" -} - -# Variables for Placement Group -variable "placement_group_strategy" { - description = "The placement strategy. Can be cluster, partition or spread." - type = string - default = "cluster" -} - -# Variables for Instance -variable "tg_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-0285a978d8bd77dcb" -} - -variable "tg_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "tg_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "tg_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c6in.4xlarge" -} - -variable "tg_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.10" -} - -variable "tg_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -variable "sut1_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-0f3ecd7f56fc232bd" -} - -variable "sut1_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "sut1_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "sut1_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c6in.4xlarge" -} - -variable "sut1_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.11" -} - -variable "sut1_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -variable "sut2_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-07898402cb1fd6561" -} - -variable "sut2_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "sut2_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "sut2_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c6in.4xlarge" -} - -variable "sut2_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.12" -} - -variable "sut2_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -# Variables for Network Interface -variable "tg_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.254" -} - -variable "tg_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.254" -} - -variable "destination_cidr_block_tg_if1" { - description = "The destination CIDR block." - type = string - default = "10.0.0.0/24" -} - -variable "destination_cidr_block_tg_if2" { - description = "The destination CIDR block." - type = string - default = "20.0.0.0/24" -} - -variable "sut1_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.11" -} - -variable "sut1_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "200.0.0.101" -} - -variable "sut2_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "200.0.0.102" -} - -variable "sut2_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.11" -} - -# Variables for Null Resource -variable "first_run_commands" { - description = "List of private IPs to assign to the ENI without regard to order." - type = list(string) - default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" - ] -} - -# Variables for Null Resource -variable "ansible_topology_path" { - description = "Ansible topology path." - type = string - default = "../../fdio.infra.ansible/cloud_topology.yaml" -} diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/versions.tf b/fdio.infra.terraform/terraform-aws-3n-c6in/versions.tf deleted file mode 100644 index 589699691e..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c6in/versions.tf +++ /dev/null @@ -1,20 +0,0 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = ">= 5.7.0" - } - null = { - source = "hashicorp/null" - version = ">= 3.2.1" - } - tls = { - source = "hashicorp/tls" - version = ">= 4.0.4" - } - vault = { - version = ">= 3.15.2" - } - } - required_version = ">= 1.4.2" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/hosts.tftpl b/fdio.infra.terraform/terraform-aws-3n-c7gn/hosts.tftpl deleted file mode 100644 index e88c8ba510..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/hosts.tftpl +++ /dev/null @@ -1,9 +0,0 @@ -all: - children: - tg: - hosts: - ${tg_public_ip} - sut: - hosts: - ${dut1_public_ip} - ${dut2_public_ip}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf deleted file mode 100644 index 68d2dd9be2..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf +++ /dev/null @@ -1,457 +0,0 @@ -data "vault_aws_access_credentials" "creds" { - backend = "${var.vault-name}-path" - role = "${var.vault-name}-role" -} - -locals { - ansible_python_executable = "/usr/bin/python3" - availability_zone = "${var.region}a" - name = "csit-vpc" - environment = "csit-vpc-environment" - key_pair_key_name = "${var.resource_prefix}-${var.testbed_name}-pk" - placement_group_name = "${var.resource_prefix}-${var.testbed_name}-pg" - security_group_name = "${var.resource_prefix}-${var.testbed_name}-sg" - testbed_name = "testbed1" - topology_name = "3n-c7gn" - tg_name = "${var.resource_prefix}-${var.testbed_name}-tg" - sut1_name = "${var.resource_prefix}-${var.testbed_name}-sut1" - sut2_name = "${var.resource_prefix}-${var.testbed_name}-sut2" -} - -# Create VPC -module "vpc" { - source = "../terraform-aws-vpc" - security_group_name = local.security_group_name - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment -} - -# Create Subnet -module "subnet_b" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.10.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 2) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -module "subnet_c" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "200.0.0.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 3) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -module "subnet_d" { - source = "../terraform-aws-subnet" - subnet_cidr_block = "192.168.20.0/24" - subnet_ipv6_cidr_block = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 4) - subnet_availability_zone = local.availability_zone - tags_name = local.name - tags_environment = local.environment - subnet_vpc_id = module.vpc.vpc_id -} - -# Create Private Key -module "private_key" { - source = "pmikus/private-key/tls" - version = "4.0.4" - - private_key_algorithm = var.private_key_algorithm -} - -# Create Key Pair -module "key_pair" { - source = "pmikus/key-pair/aws" - version = "5.7.0" - - key_pair_key_name = local.key_pair_key_name - key_pair_public_key = module.private_key.public_key_openssh - - key_pair_tags = { - "Environment" = local.environment - } -} - -# Create Placement Group -resource "aws_placement_group" "placement_group" { - name = local.placement_group_name - strategy = var.placement_group_strategy -} - -# Create Instance -resource "aws_instance" "tg" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.tg_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.tg_associate_public_ip_address - instance_initiated_shutdown_behavior = var.tg_instance_initiated_shutdown_behavior - instance_type = var.tg_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.tg_private_ip - source_dest_check = var.tg_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "1" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if1" { - depends_on = [ - module.subnet_b, - aws_instance.tg - ] - private_ip = var.tg_if1_private_ip - private_ips = [var.tg_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 1 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "tg_if2" { - depends_on = [ - module.subnet_d, - aws_instance.tg - ] - private_ips = [var.tg_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.tg_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.tg.id - device_index = 2 - } - - tags = { - "Name" = local.tg_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "tg_if1" { - id = aws_network_interface.tg_if1.id -} - -data "aws_network_interface" "tg_if2" { - id = aws_network_interface.tg_if2.id -} - -resource "aws_route" "route_tg_if1" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if1 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_route" "route_tg_if2" { - depends_on = [ - aws_instance.tg - ] - destination_cidr_block = var.destination_cidr_block_tg_if2 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = module.vpc.vpc_main_route_table_id -} - -resource "aws_instance" "sut1" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.sut1_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.sut1_associate_public_ip_address - instance_initiated_shutdown_behavior = var.sut1_instance_initiated_shutdown_behavior - instance_type = var.sut1_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.sut1_private_ip - source_dest_check = var.sut1_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if1" { - depends_on = [ - module.subnet_b, - aws_instance.sut1 - ] - private_ips = [var.sut1_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_b.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 1 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut1_if2" { - depends_on = [ - module.subnet_c, - aws_instance.sut1 - ] - private_ips = [var.sut1_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut1_source_dest_check - subnet_id = module.subnet_c.subnet_id - - attachment { - instance = aws_instance.sut1.id - device_index = 2 - } - - tags = { - "Name" = local.sut1_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "sut1_if1" { - id = aws_network_interface.sut1_if1.id -} - -data "aws_network_interface" "sut1_if2" { - id = aws_network_interface.sut1_if2.id -} - -resource "aws_instance" "sut2" { - depends_on = [ - module.vpc, - aws_placement_group.placement_group - ] - ami = var.sut2_ami - availability_zone = local.availability_zone - associate_public_ip_address = var.sut2_associate_public_ip_address - instance_initiated_shutdown_behavior = var.sut2_instance_initiated_shutdown_behavior - instance_type = var.sut2_instance_type - key_name = module.key_pair.key_pair_key_name - placement_group = aws_placement_group.placement_group.id - private_ip = var.sut2_private_ip - source_dest_check = var.sut2_source_dest_check - subnet_id = module.vpc.vpc_subnet_id - vpc_security_group_ids = [module.vpc.vpc_security_group_id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut2_if1" { - depends_on = [ - module.subnet_c, - aws_instance.sut2 - ] - private_ips = [var.sut2_if1_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut2_source_dest_check - subnet_id = module.subnet_c.subnet_id - - attachment { - instance = aws_instance.sut2.id - device_index = 1 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -resource "aws_network_interface" "sut2_if2" { - depends_on = [ - module.subnet_d, - aws_instance.sut2 - ] - private_ips = [var.sut2_if2_private_ip] - security_groups = [module.vpc.vpc_security_group_id] - source_dest_check = var.sut2_source_dest_check - subnet_id = module.subnet_d.subnet_id - - attachment { - instance = aws_instance.sut2.id - device_index = 2 - } - - tags = { - "Name" = local.sut2_name - "Environment" = local.environment - } -} - -data "aws_network_interface" "sut2_if1" { - id = aws_network_interface.sut2_if1.id -} - -data "aws_network_interface" "sut2_if2" { - id = aws_network_interface.sut2_if2.id -} - -resource "null_resource" "deploy_tg" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "null_resource" "deploy_sut1" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.sut1.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "null_resource" "deploy_sut2" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.sut1, - aws_network_interface.sut1_if1, - aws_network_interface.sut1_if2, - aws_instance.sut2, - aws_network_interface.sut2_if1, - aws_network_interface.sut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.sut2.public_ip - private_key = module.private_key.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } -} - -resource "local_file" "topology_file" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1, - aws_instance.sut2 - ] - - content = templatefile( - "${path.module}/topology-${local.topology_name}.tftpl", - { - tg_if1_mac = data.aws_network_interface.tg_if1.mac_address - tg_if2_mac = data.aws_network_interface.tg_if2.mac_address - dut1_if1_mac = data.aws_network_interface.sut1_if1.mac_address - dut1_if2_mac = data.aws_network_interface.sut1_if2.mac_address - dut2_if1_mac = data.aws_network_interface.sut2_if1.mac_address - dut2_if2_mac = data.aws_network_interface.sut2_if2.mac_address - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - dut2_public_ip = aws_instance.sut2.public_ip - } - ) - filename = "${path.module}/../../topologies/available/${local.topology_name}-${local.testbed_name}.yaml" -} - -resource "local_file" "hosts" { - depends_on = [ - aws_instance.tg, - aws_instance.sut1, - aws_instance.sut2 - ] - - content = templatefile( - "${path.module}/hosts.tftpl", - { - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.sut1.public_ip - dut2_public_ip = aws_instance.sut2.public_ip - } - ) - filename = "${path.module}/../../fdio.infra.ansible/inventories/cloud_inventory/hosts.yaml" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/output.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/output.tf deleted file mode 100644 index e69de29bb2..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/output.tf +++ /dev/null diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/providers.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/providers.tf deleted file mode 100644 index 485f0ebe30..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/providers.tf +++ /dev/null @@ -1,11 +0,0 @@ -provider "aws" { - region = var.region - access_key = data.vault_aws_access_credentials.creds.access_key - secret_key = data.vault_aws_access_credentials.creds.secret_key -} - -provider "vault" { - address = "http://10.30.51.24:8200" - skip_tls_verify = true - token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl b/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl deleted file mode 100644 index 65106da556..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl +++ /dev/null @@ -1,72 +0,0 @@ ---- -metadata: - version: 0.1 - schema: - - resources/topology_schemas/3_node_topology.sch.yaml - - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] - -nodes: - TG: - type: TG - subtype: TREX - host: "${tg_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - interfaces: - port1: - # tg_instance/p1 - 100GE port1 on ENA NIC. - mac_address: "${tg_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-100G - port2: - # tg_instance/p2 - 100GE port2 on ENA NIC. - mac_address: "${tg_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-100G - DUT1: - type: DUT - host: "${dut1_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut1_instance/p1 - 100GE port1 on ENA NIC. - mac_address: "${dut1_if1_mac}" - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-100G - port2: - # dut1_instance/p2 - 100GE port2 on ENA NIC. - mac_address: "${dut1_if2_mac}" - pci_address: "0000:00:07.0" - link: link21 - model: Amazon-Nitro-100G - DUT2: - type: DUT - host: "${dut2_public_ip}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut2_instance/p1 - 100GE port1 on ENA NIC. - mac_address: "${dut2_if1_mac}" - pci_address: "0000:00:06.0" - link: link21 - model: Amazon-Nitro-100G - port2: - # dut2_instance/p2 - 100GE port1 on ENA NIC. - mac_address: "${dut2_if2_mac}" - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-100G
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf deleted file mode 100644 index 3ad51afeba..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf +++ /dev/null @@ -1,216 +0,0 @@ -variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio-csit-jenkins" -} - -variable "region" { - description = "AWS Region." - type = string - default = "eu-west-1" -} - -variable "resource_prefix" { - description = "Resources name prefix." - type = string - default = "csit-3n-c7gn" -} - -variable "testbed_name" { - description = "Testbed name." - type = string - default = "testbed1" -} - -# Variables for Private Key -variable "private_key_algorithm" { - description = "The name of the algorithm to use for the key." - type = string - default = "ED25519" -} - -# Variables for Placement Group -variable "placement_group_strategy" { - description = "The placement strategy. Can be cluster, partition or spread." - type = string - default = "cluster" -} - -# Variables for Instance -variable "tg_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-0b5aa26a6e4192705" -} - -variable "tg_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "tg_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "tg_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c6in.4xlarge" -} - -variable "tg_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.10" -} - -variable "tg_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -variable "sut1_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-08930f71bd0be1085" -} - -variable "sut1_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "sut1_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "sut1_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c7gn.4xlarge" -} - -variable "sut1_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.11" -} - -variable "sut1_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -variable "sut2_ami" { - description = "AMI to use for the instance." - type = string - default = "ami-08930f71bd0be1085" -} - -variable "sut2_associate_public_ip_address" { - description = "Whether to associate a public IP address with an instance in a VPC." - type = bool - default = true -} - -variable "sut2_instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance." - type = string - default = "terminate" -} - -variable "sut2_instance_type" { - description = "The instance type to use for the instance." - type = string - default = "c7gn.4xlarge" -} - -variable "sut2_private_ip" { - description = "Private IP address to associate with the instance in a VPC." - type = string - default = "192.168.0.12" -} - -variable "sut2_source_dest_check" { - description = "Controls if traffic is routed to the instance when the destination address does not match the instance." - type = bool - default = false -} - -# Variables for Network Interface -variable "tg_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.254" -} - -variable "tg_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.254" -} - -variable "destination_cidr_block_tg_if1" { - description = "The destination CIDR block." - type = string - default = "10.0.0.0/24" -} - -variable "destination_cidr_block_tg_if2" { - description = "The destination CIDR block." - type = string - default = "20.0.0.0/24" -} - -variable "sut1_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.10.11" -} - -variable "sut1_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "200.0.0.101" -} - -variable "sut2_if1_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "200.0.0.102" -} - -variable "sut2_if2_private_ip" { - description = "List of private IPs to assign to the ENI without regard to order." - type = string - default = "192.168.20.11" -} - -# Variables for Null Resource -variable "first_run_commands" { - description = "List of private IPs to assign to the ENI without regard to order." - type = list(string) - default = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" - ] -} - -# Variables for Null Resource -variable "ansible_topology_path" { - description = "Ansible topology path." - type = string - default = "../../fdio.infra.ansible/cloud_topology.yaml" -} diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/versions.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/versions.tf deleted file mode 100644 index 589699691e..0000000000 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/versions.tf +++ /dev/null @@ -1,20 +0,0 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = ">= 5.7.0" - } - null = { - source = "hashicorp/null" - version = ">= 3.2.1" - } - tls = { - source = "hashicorp/tls" - version = ">= 4.0.4" - } - vault = { - version = ">= 3.15.2" - } - } - required_version = ">= 1.4.2" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf index b706d77f00..9002e55b8b 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf @@ -1,7 +1,7 @@ variable "region" { description = "AWS Region." type = string - default = "eu-north-1" + default = "us-east-1" } variable "vault_provider_address" { @@ -30,7 +30,7 @@ variable "vault_name" { variable "application_bucket" { description = "The name of the bucket." type = string - default = "elasticbeanstalk-eu-north-1-407116685360" + default = "elasticbeanstalk-us-east-1-407116685360" } variable "application_description" { @@ -42,7 +42,7 @@ variable "application_description" { variable "application_name" { description = "Name of the Beanstalk Application." type = string - default = "fdio-csit-dash-app-m7g" + default = "fdio-csit-dash-app-m8g" } variable "application_source" { diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf index cd4761e34c..95a01e3a64 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf @@ -2,10 +2,10 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.31.0" + version = ">= 5.84.0" } vault = { - version = ">= 3.23.0" + version = ">= 4.6.0" } } required_version = ">= 1.4.2" diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf index 9f115cd6c6..53413c55dc 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf @@ -1,5 +1,6 @@ -data "vault_generic_secret" "fdio_docs" { - path = "kv/secret/data/etl/fdio_docs" +data "vault_kv_secret_v2" "csit_docs" { + mount = "kv" + name = "etl/csit_docs" } data "vault_aws_access_credentials" "creds" { @@ -11,8 +12,8 @@ module "elastic_beanstalk_application" { source = "../terraform-aws-elastic-beanstalk-application" # application - application_description = "FD.io CDASH M7G" - application_name = "fdio-csit-dash-app-m7g" + application_description = "FD.io CDASH M8G" + application_name = "fdio-csit-dash-app-m8g" appversion_lifecycle_service_role_arn = "arn:aws:iam::407116685360:role/aws-service-role/elasticbeanstalk.amazonaws.com/AWSServiceRoleForElasticBeanstalk" appversion_lifecycle_max_count = 10 appversion_lifecycle_delete_source_from_s3 = false @@ -22,7 +23,7 @@ module "elastic_beanstalk_environment" { source = "../terraform-aws-elastic-beanstalk-environment" # environment - application_name = "fdio-csit-dash-app-m7g" + application_name = "fdio-csit-dash-app-m8g" # vpc vpc_cidr_block = "10.0.0.0/16" @@ -31,22 +32,22 @@ module "elastic_beanstalk_environment" { vpc_instance_tenancy = "default" # subnet - subnet_a_availability_zone = "eu-north-1a" + subnet_a_availability_zone = "us-east-1a" subnet_a_cidr_block = "10.0.0.0/20" - subnet_b_availability_zone = "eu-north-1b" + subnet_b_availability_zone = "us-east-1b" subnet_b_cidr_block = "10.0.16.0/20" # environment environment_application = module.elastic_beanstalk_application.application_name environment_description = module.elastic_beanstalk_application.application_description - environment_name = "fdio-csit-dash-env-m7g" - environment_solution_stack_name = "64bit Amazon Linux 2023 v4.0.6 running Python 3.11" + environment_name = "fdio-csit-dash-env-m8g" + environment_solution_stack_name = "64bit Amazon Linux 2023 v4.3.2 running Python 3.12" environment_tier = "WebServer" environment_wait_for_ready_timeout = "25m" environment_version_label = "" # aws:ec2:instances - instances_instance_types = "m7g.2xlarge" + instances_instance_types = "m8g.2xlarge" # aws:ec2:vpc associate_public_ip_address = true @@ -57,7 +58,7 @@ module "elastic_beanstalk_environment" { # aws:elasticbeanstalk:environment environment_loadbalancer_type = "application" - environment_loadbalancer_ssl_certificate_id = "arn:aws:acm:eu-north-1:407116685360:certificate/3ef3c6ae-f1d4-49f0-a8cd-5d090991bf73" + environment_loadbalancer_ssl_certificate_id = "arn:aws:acm:us-east-1:407116685360:certificate/3439b8aa-4f07-496f-a2de-e38159050c85" # aws:elasticbeanstalk:environment:process:default environment_process_default_healthcheck_interval = 10 @@ -117,8 +118,8 @@ module "elastic_beanstalk_environment" { # aws:elasticbeanstalk:application:environment environment_variables = { - "AWS_ACCESS_KEY_ID" = data.vault_generic_secret.fdio_docs.data["access_key"] - "AWS_SECRET_ACCESS_KEY" = data.vault_generic_secret.fdio_docs.data["secret_key"] - "AWS_DEFAULT_REGION" = data.vault_generic_secret.fdio_docs.data["region"] + "AWS_ACCESS_KEY_ID" = data.vault_kv_secret_v2.csit_docs.data["access_key"] + "AWS_SECRET_ACCESS_KEY" = data.vault_kv_secret_v2.csit_docs.data["secret_key"] + "AWS_DEFAULT_REGION" = data.vault_kv_secret_v2.csit_docs.data["region"] } } diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf index d7ff1d19ff..968cd4c962 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf @@ -1,7 +1,7 @@ variable "region" { description = "AWS Region." type = string - default = "eu-north-1" + default = "us-east-1" } variable "vault_provider_address" { diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf index 153890e01b..356c0aa582 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf @@ -2,16 +2,16 @@ terraform { backend "consul" { address = "10.30.51.24:8500" scheme = "http" - path = "terraform/dash_m7g" + path = "terraform/dash_m8g" } required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.31.0" + version = ">= 5.83.1" } vault = { - version = ">= 3.23.0" + version = ">= 4.6.0" } } - required_version = ">= 1.4.2" + required_version = ">= 1.10.4" } diff --git a/fdio.infra.terraform/terraform-aws-vpc/variables.tf b/fdio.infra.terraform/terraform-aws-vpc/variables.tf index a501356063..e357f6eaf5 100644 --- a/fdio.infra.terraform/terraform-aws-vpc/variables.tf +++ b/fdio.infra.terraform/terraform-aws-vpc/variables.tf @@ -71,6 +71,14 @@ variable "security_group_ingress" { cidr_blocks = ["0.0.0.0/0"] ipv6_cidr_blocks = ["::/0"] }, + { + from_port = 6001 + to_port = 6002 + protocol = "tcp" + self = false + cidr_blocks = ["0.0.0.0/0"] + ipv6_cidr_blocks = ["::/0"] + } ] } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-device-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-device-rls2410.hcl.tftpl deleted file mode 100644 index 96fef71e17..0000000000 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-device-rls2410.hcl.tftpl +++ /dev/null @@ -1,59 +0,0 @@ -job "${job_name}" { - datacenters = ["${datacenters}"] - type = "${type}" - periodic { - cron = "${cron}" - prohibit_overlap = "${prohibit_overlap}" - time_zone = "${time_zone}" - } - group "${job_name}" { - restart { - mode = "fail" - } - constraint { - attribute = "$${attr.cpu.arch}" - operator = "!=" - value = "arm64" - } - constraint { - attribute = "$${node.class}" - value = "builder" - } - task "${job_name}" { - artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_device_rls2410.py" - destination = "local/" - } - artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_device.json" - destination = "local/" - } - driver = "docker" - config { - image = "${image}" - command = "gluesparksubmit" - args = [ - "--driver-memory", "20g", - "--executor-memory", "20g", - "--executor-cores", "2", - "--master", "local[2]", - "coverage_device_rls2410.py" - ] - work_dir = "/local" - } - env { - AWS_ACCESS_KEY_ID = "${aws_access_key_id}" - AWS_SECRET_ACCESS_KEY = "${aws_secret_access_key}" - AWS_DEFAULT_REGION = "${aws_default_region}" - OUT_AWS_ACCESS_KEY_ID = "${out_aws_access_key_id}" - OUT_AWS_SECRET_ACCESS_KEY = "${out_aws_secret_access_key}" - OUT_AWS_DEFAULT_REGION = "${out_aws_default_region}" - ${ envs } - } - resources { - cpu = ${cpu} - memory = ${memory} - } - } - } -} diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack.hcl.tftpl index 974e915101..8aa364388d 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-hoststack.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_hoststack_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_hoststack.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_hoststack_rls2410.py" + "coverage_hoststack.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr.hcl.tftpl index c2c282752b..1a2db579a3 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-mrr.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_mrr_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_mrr.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_mrr_rls2410.py" + "coverage_mrr.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr.hcl.tftpl index ee4771b0b3..b294c390cd 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-ndrpdr.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_ndrpdr_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_ndrpdr.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_ndrpdr_rls2410.py" + "coverage_ndrpdr.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf.hcl.tftpl index d31ebd81de..83bbceb109 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-reconf.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_reconf_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_reconf.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_reconf_rls2410.py" + "coverage_reconf.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak.hcl.tftpl index 9d71dd8b9b..871e4f79a3 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-coverage-soak.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_soak_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/coverage_soak.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "coverage_soak_rls2410.py" + "coverage_soak.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack.hcl.tftpl index 79397eda20..c7a9f60730 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-hoststack.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_hoststack_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_hoststack.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_hoststack_rls2410.py" + "iterative_hoststack.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr.hcl.tftpl index c1c298d4a4..3274596680 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-mrr.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_mrr_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_mrr.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_mrr_rls2410.py" + "iterative_mrr.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr.hcl.tftpl index 42202f30e2..0d9f4bb250 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-ndrpdr.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_ndrpdr_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_ndrpdr.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_ndrpdr_rls2410.py" + "iterative_ndrpdr.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf.hcl.tftpl index 4a7773ca46..5045edbb33 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-reconf.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_reconf_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_reconf.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_reconf_rls2410.py" + "iterative_reconf.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak-rls2410.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak.hcl.tftpl index 3759f4bb46..c569a43b2f 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak-rls2410.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl-iterative-soak.hcl.tftpl @@ -21,7 +21,7 @@ job "${job_name}" { } task "${job_name}" { artifact { - source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_soak_rls2410.py" + source = "https://raw.githubusercontent.com/FDio/csit/master/csit.infra.etl/iterative_soak.py" destination = "local/" } artifact { @@ -37,7 +37,7 @@ job "${job_name}" { "--executor-memory", "20g", "--executor-cores", "2", "--master", "local[2]", - "iterative_soak_rls2410.py" + "iterative_soak.py" ] work_dir = "/local" } diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/main.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/main.tf index 57baa24276..b9027a8ceb 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/main.tf +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/main.tf @@ -3,9 +3,9 @@ data "vault_kv_secret_v2" "fdio_logs" { name = "etl/fdio_logs" } -data "vault_kv_secret_v2" "fdio_docs" { +data "vault_kv_secret_v2" "csit_docs" { mount = "kv" - name = "etl/fdio_docs" + name = "etl/csit_docs" } module "etl" { @@ -18,9 +18,9 @@ module "etl" { aws_access_key_id = data.vault_kv_secret_v2.fdio_logs.data.access_key aws_secret_access_key = data.vault_kv_secret_v2.fdio_logs.data.secret_key aws_default_region = data.vault_kv_secret_v2.fdio_logs.data.region - out_aws_access_key_id = data.vault_kv_secret_v2.fdio_docs.data.access_key - out_aws_secret_access_key = data.vault_kv_secret_v2.fdio_docs.data.secret_key - out_aws_default_region = data.vault_kv_secret_v2.fdio_docs.data.region + out_aws_access_key_id = data.vault_kv_secret_v2.csit_docs.data.access_key + out_aws_secret_access_key = data.vault_kv_secret_v2.csit_docs.data.secret_key + out_aws_default_region = data.vault_kv_secret_v2.csit_docs.data.region cron = "0 30 0 * * * *" datacenters = ["yul1"] job_name = each.key diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/variables.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/variables.tf index e8ddeb086c..d0d9fa171f 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/variables.tf +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/variables.tf @@ -55,51 +55,47 @@ variable "nomad_jobs" { memory = 50000 }, { - job_name = "etl-trending-hoststack" + job_name = "etl-iterative-hoststack" memory = 50000 }, { - job_name = "etl-iterative-hoststack-rls2410" + job_name = "etl-iterative-mrr" memory = 50000 }, { - job_name = "etl-iterative-mrr-rls2410" + job_name = "etl-iterative-ndrpdr" memory = 50000 }, { - job_name = "etl-iterative-ndrpdr-rls2410" + job_name = "etl-iterative-reconf" memory = 50000 }, { - job_name = "etl-iterative-reconf-rls2410" + job_name = "etl-iterative-soak" memory = 50000 }, { - job_name = "etl-iterative-soak-rls2410" + job_name = "etl-coverage-hoststack" memory = 50000 }, { - job_name = "etl-coverage-device-rls2410" + job_name = "etl-coverage-mrr" memory = 50000 }, { - job_name = "etl-coverage-hoststack-rls2410" + job_name = "etl-coverage-ndrpdr" memory = 50000 }, { - job_name = "etl-coverage-mrr-rls2410" + job_name = "etl-coverage-reconf" memory = 50000 }, { - job_name = "etl-coverage-ndrpdr-rls2410" + job_name = "etl-coverage-soak" memory = 50000 }, { - job_name = "etl-coverage-reconf-rls2410" - memory = 50000 - }, - { - job_name = "etl-coverage-soak-rls2410" + job_name = "etl-trending-hoststack" memory = 50000 }, { diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/versions.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/versions.tf index ffe25bb42e..cf67cc25c7 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/versions.tf +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/versions.tf @@ -10,8 +10,8 @@ terraform { version = ">= 2.3.0" } vault = { - version = ">= 4.3.0" + version = ">= 4.6.0" } } - required_version = ">= 1.5.4" + required_version = ">= 1.10.4" } diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/main.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/main.tf deleted file mode 100644 index 08c3ca8b73..0000000000 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/main.tf +++ /dev/null @@ -1,23 +0,0 @@ -module "fdio-logs" { - # fdio logs iam - source = "../" - name = "dynamic-aws-creds-vault-fdio-logs" - aws_access_key = var.aws_access_key - aws_secret_key = var.aws_secret_key -} - -module "fdio-docs" { - # fdio docs iam - source = "../" - name = "dynamic-aws-creds-vault-fdio-docs" - aws_access_key = var.aws_access_key - aws_secret_key = var.aws_secret_key -} - -module "fdio-csit-jenkins" { - # fdio csit jenkins iam - source = "../" - name = "dynamic-aws-creds-vault-fdio-csit-jenkins" - aws_access_key = var.aws_access_key - aws_secret_key = var.aws_secret_key -} diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/main.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/main.tf index 814121986f..6a2d42e681 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/main.tf +++ b/fdio.infra.terraform/terraform-vault-aws-secret-backend/main.tf @@ -1,4 +1,4 @@ -resource "vault_aws_secret_backend" "aws" { +resource "vault_aws_secret_backend" "aws_secret_backend" { access_key = var.aws_access_key secret_key = var.aws_secret_key path = "${var.name}-path" @@ -7,34 +7,18 @@ resource "vault_aws_secret_backend" "aws" { max_lease_ttl_seconds = "0" } -resource "vault_aws_secret_backend_role" "admin" { - backend = vault_aws_secret_backend.aws.path +resource "vault_aws_secret_backend_role" "aws_secret_backend_role" { + backend = vault_aws_secret_backend.aws_secret_backend.path name = "${var.name}-role" credential_type = "iam_user" - policy_document = <<EOF -{ - "Version": "2012-10-17", - "Statement": [ - { - "Effect": "Allow", - "Action": [ - "iam:*", - "ec2:*", - "s3:*", - "elasticbeanstalk:*" - ], - "Resource": "*" - } - ] -} -EOF + policy_document = var.policy_document } output "backend" { - value = vault_aws_secret_backend.aws.path + value = vault_aws_secret_backend.aws_secret_backend.path } output "role" { - value = vault_aws_secret_backend_role.admin.name + value = vault_aws_secret_backend_role.aws_secret_backend_role.name } diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/variables.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/variables.tf index 2545345185..d7a2f4a987 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/variables.tf +++ b/fdio.infra.terraform/terraform-vault-aws-secret-backend/variables.tf @@ -15,3 +15,8 @@ variable "name" { description = "Vault path" type = string } + +variable "policy_document" { + description = "AWS policy document" + type = string +} diff --git a/fdio.infra.terraform/terraform-vault-fdio-creds/main.tf b/fdio.infra.terraform/terraform-vault-fdio-creds/main.tf new file mode 100644 index 0000000000..4469bb131c --- /dev/null +++ b/fdio.infra.terraform/terraform-vault-fdio-creds/main.tf @@ -0,0 +1,86 @@ +module "fdio-logs" { + # fdio logs iam + source = "../terraform-vault-aws-secret-backend" + name = "dynamic-aws-creds-vault-fdio-logs" + aws_access_key = var.aws_access_key + aws_secret_key = var.aws_secret_key + policy_document = jsonencode({ + Statement = [ + { + Action = [ + "iam:*", + "ec2:*", + "s3:*", + "elasticbeanstalk:*", + "ssm:*", + "cloudformation:*", + "logs:*", + "elasticloadbalancing:*", + "autoscaling:*", + "cloudwatch:*" + ] + Effect = "Allow" + Resource = "*" + }, + ] + Version = "2012-10-17" + }) +} + +module "csit-cdash" { + # csit cdash iam + source = "../terraform-vault-aws-secret-backend" + name = "dynamic-aws-creds-vault-cdash" + aws_access_key = var.aws_access_key + aws_secret_key = var.aws_secret_key + policy_document = jsonencode({ + Statement = [ + { + Action = [ + "iam:*", + "ec2:*", + "s3:*", + "elasticbeanstalk:*", + "ssm:*", + "cloudformation:*", + "logs:*", + "elasticloadbalancing:*", + "autoscaling:*", + "cloudwatch:*" + ] + Effect = "Allow" + Resource = "*" + }, + ] + Version = "2012-10-17" + }) +} + +module "fdio-csit-jenkins" { + # fdio csit jenkins iam + source = "../terraform-vault-aws-secret-backend" + name = "dynamic-aws-creds-vault-fdio-csit-jenkins" + aws_access_key = var.aws_access_key + aws_secret_key = var.aws_secret_key + policy_document = jsonencode({ + Statement = [ + { + Action = [ + "iam:*", + "ec2:*", + "s3:*", + "elasticbeanstalk:*", + "ssm:*", + "cloudformation:*", + "logs:*", + "elasticloadbalancing:*", + "autoscaling:*", + "cloudwatch:*" + ] + Effect = "Allow" + Resource = "*" + }, + ] + Version = "2012-10-17" + }) +} diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/providers.tf b/fdio.infra.terraform/terraform-vault-fdio-creds/providers.tf index 102fd31b87..102fd31b87 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/providers.tf +++ b/fdio.infra.terraform/terraform-vault-fdio-creds/providers.tf diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf b/fdio.infra.terraform/terraform-vault-fdio-creds/variables.tf index b1f64eccf2..b1f64eccf2 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf +++ b/fdio.infra.terraform/terraform-vault-fdio-creds/variables.tf diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/versions.tf b/fdio.infra.terraform/terraform-vault-fdio-creds/versions.tf index c573731d65..c573731d65 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/versions.tf +++ b/fdio.infra.terraform/terraform-vault-fdio-creds/versions.tf |