diff options
Diffstat (limited to 'fdio.infra.terraform')
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/.gitignore | 36 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/deploy/main.tf | 499 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/deploy/providers.tf | 11 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf | 162 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/deploy/versions.tf | 20 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/main.tf | 54 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/variables.tf | 67 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/.gitignore | 36 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/deploy/main.tf | 632 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/deploy/providers.tf | 11 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf | 180 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/deploy/versions.tf | 20 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/main.tf | 57 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/variables.tf | 67 | ||||
| -rw-r--r-- | fdio.infra.terraform/terraform-aws-2n-aws-c5n/versions.tf | 2 |
15 files changed, 1 insertions, 1853 deletions
diff --git a/fdio.infra.terraform/2n_aws_c5n/.gitignore b/fdio.infra.terraform/2n_aws_c5n/.gitignore deleted file mode 100644 index 223f2ec48c..0000000000 --- a/fdio.infra.terraform/2n_aws_c5n/.gitignore +++ /dev/null @@ -1,36 +0,0 @@ -# Local .terraform directories -**/.terraform/* - -# .tfstate files -*.tfstate -*.tfstate.* -.terraform.lock.hcl -.terraform.tfstate.lock.info - -# Crash log files -crash.log - -# Exclude all .tfvars files, which are likely to contain sentitive data, such as -# password, private keys, and other secrets. These should not be part of version -# control as they are data points which are potentially sensitive and subject -# to change depending on the environment. -# -*.tfvars - -# Ignore override files as they are usually used to override resources locally and so -# are not checked in -override.tf -override.tf.json -*_override.tf -*_override.tf.json - -# Include override files you do wish to add to version control using negated pattern -# -# !example_override.tf - -# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan -# example: *tfplan* - -# Ignore CLI configuration files -.terraformrc -terraform.rc
\ No newline at end of file diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf deleted file mode 100644 index 351cec6c54..0000000000 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf +++ /dev/null @@ -1,499 +0,0 @@ -data "vault_aws_access_credentials" "creds" { - backend = "${var.vault-name}-path" - role = "${var.vault-name}-role" -} - -resource "aws_vpc" "CSITVPC" { - assign_generated_ipv6_cidr_block = true - enable_dns_hostnames = false - enable_dns_support = true - cidr_block = var.vpc_cidr_mgmt - instance_tenancy = "default" - - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-vpc" - "Environment" = var.environment_name - } -} - -resource "aws_security_group" "CSITSG" { - depends_on = [ - aws_vpc.CSITVPC - ] - description = "Allow inbound traffic" - name = "${var.resources_name_prefix}_${var.testbed_name}-sg" - revoke_rules_on_delete = false - vpc_id = aws_vpc.CSITVPC.id - - ingress { - from_port = 22 - to_port = 22 - protocol = "tcp" - cidr_blocks = ["0.0.0.0/0"] - } - - ingress { - from_port = 22 - to_port = 22 - protocol = "tcp" - ipv6_cidr_blocks = ["::/0"] - } - - ingress { - from_port = 0 - to_port = 0 - protocol = -1 - self = true - ipv6_cidr_blocks = ["::/0"] - } - - egress { - from_port = 0 - to_port = 0 - protocol = "-1" - cidr_blocks = ["0.0.0.0/0"] - } - - egress { - from_port = 0 - to_port = 0 - protocol = "-1" - ipv6_cidr_blocks = ["::/0"] - } - - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-sg" - "Environment" = var.environment_name - } -} - -resource "aws_vpc_ipv4_cidr_block_association" "b" { - depends_on = [ - aws_vpc.CSITVPC - ] - cidr_block = var.vpc_cidr_b - vpc_id = aws_vpc.CSITVPC.id -} - -resource "aws_vpc_ipv4_cidr_block_association" "c" { - depends_on = [ - aws_vpc.CSITVPC - ] - cidr_block = var.vpc_cidr_c - vpc_id = aws_vpc.CSITVPC.id -} - -resource "aws_vpc_ipv4_cidr_block_association" "d" { - depends_on = [ - aws_vpc.CSITVPC - ] - cidr_block = var.vpc_cidr_d - vpc_id = aws_vpc.CSITVPC.id -} - -# Subnets -resource "aws_subnet" "mgmt" { - availability_zone = var.avail_zone - assign_ipv6_address_on_creation = false - cidr_block = var.vpc_cidr_mgmt - depends_on = [ - aws_vpc.CSITVPC - ] - ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 1) - map_public_ip_on_launch = false - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_subnet" "b" { - availability_zone = var.avail_zone - assign_ipv6_address_on_creation = true - cidr_block = var.vpc_cidr_b - depends_on = [ - aws_vpc.CSITVPC, - aws_vpc_ipv4_cidr_block_association.b - ] - ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 2) - map_public_ip_on_launch = false - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_subnet" "c" { - availability_zone = var.avail_zone - assign_ipv6_address_on_creation = true - cidr_block = var.vpc_cidr_c - depends_on = [ - aws_vpc.CSITVPC, - aws_vpc_ipv4_cidr_block_association.c - ] - ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 3) - map_public_ip_on_launch = false - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_subnet" "d" { - availability_zone = var.avail_zone - assign_ipv6_address_on_creation = true - cidr_block = var.vpc_cidr_d - depends_on = [ - aws_vpc.CSITVPC, - aws_vpc_ipv4_cidr_block_association.d - ] - ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 4) - map_public_ip_on_launch = false - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_internet_gateway" "CSITGW" { - depends_on = [ - aws_vpc.CSITVPC - ] - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -# SSH keypair -# Temporary key for provisioning only -resource "tls_private_key" "CSITTLS" { - algorithm = "RSA" - ecdsa_curve = "P521" - rsa_bits = 4096 -} - -resource "aws_key_pair" "CSITKP" { - key_name = "${var.resources_name_prefix}_${var.testbed_name}-key" - public_key = "${tls_private_key.CSITTLS.public_key_openssh}" -} - -resource "aws_placement_group" "CSITPG" { - name = "${var.resources_name_prefix}_${var.testbed_name}-pg" - strategy = "cluster" -} - -# NICs -resource "aws_network_interface" "dut1_if1" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.b, - aws_instance.dut1 - ] - private_ip = var.dut1_if1_ip - private_ips = [var.dut1_if1_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.b.id - - attachment { - instance = aws_instance.dut1.id - device_index = 1 - } - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_network_interface" "dut1_if2" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.d, - aws_instance.dut1 - ] - private_ip = var.dut1_if2_ip - private_ips = [var.dut1_if2_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.d.id - - attachment { - instance = aws_instance.dut1.id - device_index = 2 - } - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_network_interface" "tg_if1" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.b, - aws_instance.tg - ] - private_ip = var.tg_if1_ip - private_ips = [var.tg_if1_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.b.id - - attachment { - instance = aws_instance.tg.id - device_index = 1 - } - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_network_interface" "tg_if2" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.d, - aws_instance.tg - ] - private_ip = var.tg_if2_ip - private_ips = [var.tg_if2_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.d.id - - attachment { - instance = aws_instance.tg.id - device_index = 2 - } - - tags = { - "Environment" = var.environment_name - } -} - -data "aws_network_interface" "dut1_if1" { - id = aws_network_interface.dut1_if1.id -} - -data "aws_network_interface" "dut1_if2" { - id = aws_network_interface.dut1_if2.id -} - -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 -} - -# Instances -resource "aws_instance" "tg" { - depends_on = [ - aws_vpc.CSITVPC, - aws_placement_group.CSITPG, - aws_security_group.CSITSG - ] - ami = var.ami_image_tg - availability_zone = var.avail_zone - associate_public_ip_address = true - instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior - instance_type = var.instance_type - key_name = aws_key_pair.CSITKP.key_name - placement_group = aws_placement_group.CSITPG.id - private_ip = var.tg_mgmt_ip - source_dest_check = false - subnet_id = aws_subnet.mgmt.id - vpc_security_group_ids = [aws_security_group.CSITSG.id] - # host_id = "1" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-tg" - "Environment" = var.environment_name - } -} - -resource "aws_instance" "dut1" { - depends_on = [ - aws_vpc.CSITVPC, - aws_placement_group.CSITPG, - aws_security_group.CSITSG, - aws_instance.tg - ] - ami = var.ami_image_sut - availability_zone = var.avail_zone - associate_public_ip_address = true - instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior - instance_type = var.instance_type - key_name = aws_key_pair.CSITKP.key_name - placement_group = aws_placement_group.CSITPG.id - private_ip = var.dut1_mgmt_ip - source_dest_check = false - subnet_id = aws_subnet.mgmt.id - vpc_security_group_ids = [aws_security_group.CSITSG.id] - # host_id = "2" - - root_block_device { - delete_on_termination = true - volume_size = 50 - } - - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-dut1" - "Environment" = var.environment_name - } -} - -# Routes -resource "aws_route" "CSIT-igw" { - depends_on = [ - aws_vpc.CSITVPC, - aws_internet_gateway.CSITGW - ] - destination_cidr_block = "0.0.0.0/0" - destination_ipv6_cidr_block = "::/0" - gateway_id = aws_internet_gateway.CSITGW.id - route_table_id = aws_vpc.CSITVPC.main_route_table_id -} - -resource "aws_route" "dummy-trex-port-0" { - depends_on = [ - aws_vpc.CSITVPC, - aws_instance.dut1 - ] - destination_cidr_block = var.trex_dummy_cidr_port_0 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = aws_vpc.CSITVPC.main_route_table_id -} - -resource "aws_route" "dummy-trex-port-1" { - depends_on = [ - aws_vpc.CSITVPC, - aws_instance.dut1 - ] - destination_cidr_block = var.trex_dummy_cidr_port_1 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = aws_vpc.CSITVPC.main_route_table_id -} - -# Deployment/Ansible -resource "null_resource" "deploy_tg" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.dut1, - aws_network_interface.dut1_if1, - aws_network_interface.dut1_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = tls_private_key.CSITTLS.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } - -# provisioner "ansible" { -# plays { -# playbook { -# file_path = var.ansible_file_path -# force_handlers = true -# } -# hosts = ["tg_aws"] -# extra_vars = { -# ansible_ssh_pass = var.ansible_provision_pwd -# ansible_python_interpreter = var.ansible_python_executable -# aws = true -# } -# } -# } -# -# provisioner "remote-exec" { -# on_failure = continue -# inline = ["sudo reboot"] -# } -} - -resource "null_resource" "deploy_dut1" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.dut1, - aws_network_interface.dut1_if1, - aws_network_interface.dut1_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.dut1.public_ip - private_key = tls_private_key.CSITTLS.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } - -# provisioner "ansible" { -# plays { -# playbook { -# file_path = var.ansible_file_path -# force_handlers = true -# } -# hosts = ["sut_aws"] -# extra_vars = { -# ansible_ssh_pass = var.ansible_provision_pwd -# ansible_python_interpreter = var.ansible_python_executable -# aws = true -# } -# } -# } -# -# provisioner "remote-exec" { -# on_failure = continue -# inline = ["sudo reboot"] -# } -} - -resource "null_resource" "deploy_topology" { - depends_on = [ - aws_instance.tg, - aws_instance.dut1 - ] - - provisioner "ansible" { - plays { - playbook { - file_path = var.ansible_topology_path - } - hosts = ["local"] - extra_vars = { - ansible_python_interpreter = var.ansible_python_executable - testbed_name = var.testbed_name - cloud_topology = var.topology_name - 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.dut1_if1.mac_address - dut1_if2_mac = data.aws_network_interface.dut1_if2.mac_address - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.dut1.public_ip - public_ip_list = "${aws_instance.tg.public_ip},${aws_instance.dut1.public_ip}" - } - } - } -} diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/providers.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/providers.tf deleted file mode 100644 index 38244af0bd..0000000000 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/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.28:8200" - skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf deleted file mode 100644 index b25add26e5..0000000000 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf +++ /dev/null @@ -1,162 +0,0 @@ -variable "region" { - description = "AWS Region" - type = string -} - -variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio" -} - -variable "ami_image_tg" { - description = "AWS AMI image name for TG" - type = string -} - -variable "ami_image_sut" { - description = "AWS AMI image name for SUT" - type = string -} - -variable "testbed_name" { - description = "Testbed name" - type = string -} - -variable "instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance" - type = string - default = "terminate" -} - -variable "instance_type" { - description = "AWS instance type" - type = string -} - -variable "avail_zone" { - description = "AWS availability zone" - type = string -} - -variable "topology_name" { - description = "Prefix used when creating a topology file" - type = string - default = "2n_aws_c5n" -} - -variable "environment_name" { - description = "Environment name - used for Environment tag" - type = string - default = "CSIT-AWS" -} - -variable "resources_name_prefix" { - description = "Resource prefix - used for Name tag" - type = string - default = "CSIT_2n_aws_c5n" -} - -variable "first_run_commands" { - description = "Commands to run after deployment via remote-exec" - type = list(string) - default = [""] -} - -variable "ansible_file_path" { - description = "Path to Ansible playbook" - type = string - default = "../../fdio.infra.ansible/site.yaml" -} - -variable "ansible_python_executable" { - description = "Path to Python interpreter" - type = string - default = "/usr/bin/python3" -} - -variable "ansible_topology_path" { - description = "Path to Ansible playbook which creates a topology file" - type = string - default = "../../fdio.infra.ansible/cloud_topology.yaml" -} - -variable "ansible_provision_pwd" { - description = "Password used for ansible provisioning (ansible_ssh_pass)" - type = string - default = "Csit1234" -} - -# Base VPC CIDRs -variable "vpc_cidr_mgmt" { - description = "Management CIDR block" - type = string - default = "192.168.0.0/24" -} - -variable "vpc_cidr_b" { - description = "CIDR block B" - type = string - default = "192.168.10.0/24" -} - -variable "vpc_cidr_c" { - description = "CIDR block C" - type = string - default = "200.0.0.0/24" -} - -variable "vpc_cidr_d" { - description = "CIDR block D" - type = string - default = "192.168.20.0/24" -} - -# Trex Dummy CIDRs -variable "trex_dummy_cidr_port_0" { - description = "TREX dummy CIDR" - type = string - default = "10.0.0.0/24" -} - -variable "trex_dummy_cidr_port_1" { - description = "TREX dummy CIDR" - type = string - default = "20.0.0.0/24" -} - -# IPs -variable "tg_if1_ip" { - description = "TG IP on interface 1" - type = string - default = "192.168.10.254" -} - -variable "tg_if2_ip" { - description = "TG IP on interface 2" - type = string - default = "192.168.20.254" -} - -variable "dut1_if1_ip" { - description = "DUT IP on interface 1" - type = string - default = "192.168.10.11" -} - -variable "dut1_if2_ip" { - description = "DUT IP on interface 1" - type = string - default = "192.168.20.11" -} - -variable "tg_mgmt_ip" { - description = "TG management interface IP" - type = string - default = "192.168.0.10" -} - -variable "dut1_mgmt_ip" { - description = "DUT management interface IP" - type = string - default = "192.168.0.11" -} diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/versions.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/versions.tf deleted file mode 100644 index 3d1a975ea7..0000000000 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/versions.tf +++ /dev/null @@ -1,20 +0,0 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = "~> 3.61.0" - } - null = { - source = "hashicorp/null" - version = "~> 3.1.0" - } - tls = { - source = "hashicorp/tls" - version = "~> 3.1.0" - } - vault = { - version = ">=2.22.1" - } - } - required_version = ">= 1.0.3" -} diff --git a/fdio.infra.terraform/2n_aws_c5n/main.tf b/fdio.infra.terraform/2n_aws_c5n/main.tf deleted file mode 100644 index d2e5afdc6a..0000000000 --- a/fdio.infra.terraform/2n_aws_c5n/main.tf +++ /dev/null @@ -1,54 +0,0 @@ -module "deploy" { - source = "./deploy" - - # Parameters starting with var. can be set using "TF_VAR_*" environment - # variables or -var parameter when running "terraform apply", for default - # values see ./variables.tf - testbed_name = var.testbed_name - topology_name = var.topology_name - environment_name = var.environment_name - resources_name_prefix = var.resources_name_prefix - - # AWS general - region = var.region - avail_zone = var.avail_zone - instance_type = var.instance_type - ami_image_tg = var.ami_image_tg - ami_image_sut = var.ami_image_sut - - # AWS Network - vpc_cidr_mgmt = "192.168.0.0/24" - vpc_cidr_b = "192.168.10.0/24" - vpc_cidr_c = "200.0.0.0/24" - vpc_cidr_d = "192.168.20.0/24" - - tg_mgmt_ip = "192.168.0.10" - dut1_mgmt_ip = "192.168.0.11" - - tg_if1_ip = "192.168.10.254" - tg_if2_ip = "192.168.20.254" - dut1_if1_ip = "192.168.10.11" - dut1_if2_ip = "192.168.20.11" - - trex_dummy_cidr_port_0 = "10.0.0.0/16" - trex_dummy_cidr_port_1 = "20.0.0.0/16" - - # Ansible - ansible_python_executable = "/usr/bin/python3" - ansible_file_path = "../../fdio.infra.ansible/site.yaml" - ansible_topology_path = "../../fdio.infra.ansible/cloud_topology.yaml" - ansible_provision_pwd = "Csit1234" - - # First run - # TODO: Remove the testuser creation when added to user_add ansible role - first_run_commands = [ - "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" - ] -} diff --git a/fdio.infra.terraform/2n_aws_c5n/variables.tf b/fdio.infra.terraform/2n_aws_c5n/variables.tf deleted file mode 100644 index 2673442af2..0000000000 --- a/fdio.infra.terraform/2n_aws_c5n/variables.tf +++ /dev/null @@ -1,67 +0,0 @@ -variable "region" { - description = "AWS Region" - type = string - default = "eu-central-1" -} - -variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio" -} - -variable "avail_zone" { - description = "AWS availability zone" - type = string - default = "eu-central-1a" -} - -variable "ami_image_tg" { - # eu-central-1/focal-20.04-amd64-hvm-ssd-20210119.1 - # kernel 5.4.0-1035-aws (~5.4.0-65) - description = "AWS AMI image ID" - type = string - default = "ami-0c2d02d48236a23dd" -} - -variable "ami_image_sut" { - # eu-central-1/focal-20.04-amd64-hvm-ssd-20210119.1 - # kernel 5.4.0-1035-aws (~5.4.0-65) - description = "AWS AMI image ID" - type = string - default = "ami-05ea90e57d2df4368" -} - -variable "instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance" - type = string - default = "terminate" -} - -variable "instance_type" { - description = "AWS instance type" - type = string - default = "c5n.4xlarge" -} - -variable "testbed_name" { - description = "Testbed name" - type = string - default = "testbed1" -} - -variable "topology_name" { - description = "Topology name" - type = string - default = "2n_aws_c5n" -} - -variable "environment_name" { - description = "Environment name" - type = string - default = "CSIT-AWS" -} - -variable "resources_name_prefix" { - description = "Resources name prefix" - type = string - default = "CSIT_2n_aws_c5n" -} diff --git a/fdio.infra.terraform/3n_aws_c5n/.gitignore b/fdio.infra.terraform/3n_aws_c5n/.gitignore deleted file mode 100644 index 223f2ec48c..0000000000 --- a/fdio.infra.terraform/3n_aws_c5n/.gitignore +++ /dev/null @@ -1,36 +0,0 @@ -# Local .terraform directories -**/.terraform/* - -# .tfstate files -*.tfstate -*.tfstate.* -.terraform.lock.hcl -.terraform.tfstate.lock.info - -# Crash log files -crash.log - -# Exclude all .tfvars files, which are likely to contain sentitive data, such as -# password, private keys, and other secrets. These should not be part of version -# control as they are data points which are potentially sensitive and subject -# to change depending on the environment. -# -*.tfvars - -# Ignore override files as they are usually used to override resources locally and so -# are not checked in -override.tf -override.tf.json -*_override.tf -*_override.tf.json - -# Include override files you do wish to add to version control using negated pattern -# -# !example_override.tf - -# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan -# example: *tfplan* - -# Ignore CLI configuration files -.terraformrc -terraform.rc
\ No newline at end of file diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf deleted file mode 100644 index 188b095b55..0000000000 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf +++ /dev/null @@ -1,632 +0,0 @@ -data "vault_aws_access_credentials" "creds" { - backend = "${var.vault-name}-path" - role = "${var.vault-name}-role" -} - -resource "aws_vpc" "CSITVPC" { - assign_generated_ipv6_cidr_block = true - enable_dns_hostnames = false - enable_dns_support = true - cidr_block = var.vpc_cidr_mgmt - instance_tenancy = "default" - - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-vpc" - "Environment" = var.environment_name - } -} - -resource "aws_security_group" "CSITSG" { - depends_on = [ - aws_vpc.CSITVPC - ] - description = "Allow inbound traffic" - name = "${var.resources_name_prefix}_${var.testbed_name}-sg" - revoke_rules_on_delete = false - vpc_id = aws_vpc.CSITVPC.id - - ingress { - from_port = 22 - to_port = 22 - protocol = "tcp" - cidr_blocks = ["0.0.0.0/0"] - } - - ingress { - from_port = 22 - to_port = 22 - protocol = "tcp" - ipv6_cidr_blocks = ["::/0"] - } - - ingress { - from_port = 0 - to_port = 0 - protocol = -1 - self = true - ipv6_cidr_blocks = ["::/0"] - } - - egress { - from_port = 0 - to_port = 0 - protocol = "-1" - cidr_blocks = ["0.0.0.0/0"] - } - - egress { - from_port = 0 - to_port = 0 - protocol = "-1" - ipv6_cidr_blocks = ["::/0"] - } - - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-sg" - "Environment" = var.environment_name - } -} - -resource "aws_vpc_ipv4_cidr_block_association" "b" { - depends_on = [ - aws_vpc.CSITVPC - ] - cidr_block = var.vpc_cidr_b - vpc_id = aws_vpc.CSITVPC.id -} - -resource "aws_vpc_ipv4_cidr_block_association" "c" { - depends_on = [ - aws_vpc.CSITVPC - ] - cidr_block = var.vpc_cidr_c - vpc_id = aws_vpc.CSITVPC.id -} - -resource "aws_vpc_ipv4_cidr_block_association" "d" { - depends_on = [ - aws_vpc.CSITVPC - ] - cidr_block = var.vpc_cidr_d - vpc_id = aws_vpc.CSITVPC.id -} - -# Subnets -resource "aws_subnet" "mgmt" { - availability_zone = var.avail_zone - assign_ipv6_address_on_creation = false - cidr_block = var.vpc_cidr_mgmt - depends_on = [ - aws_vpc.CSITVPC - ] - ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 1) - map_public_ip_on_launch = false - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_subnet" "b" { - availability_zone = var.avail_zone - assign_ipv6_address_on_creation = false - cidr_block = var.vpc_cidr_b - depends_on = [ - aws_vpc.CSITVPC, - aws_vpc_ipv4_cidr_block_association.b - ] - ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 2) - map_public_ip_on_launch = false - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_subnet" "c" { - availability_zone = var.avail_zone - assign_ipv6_address_on_creation = false - cidr_block = var.vpc_cidr_c - depends_on = [ - aws_vpc.CSITVPC, - aws_vpc_ipv4_cidr_block_association.c - ] - ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 3) - map_public_ip_on_launch = false - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_subnet" "d" { - availability_zone = var.avail_zone - assign_ipv6_address_on_creation = false - cidr_block = var.vpc_cidr_d - depends_on = [ - aws_vpc.CSITVPC, - aws_vpc_ipv4_cidr_block_association.d - ] - ipv6_cidr_block = cidrsubnet(aws_vpc.CSITVPC.ipv6_cidr_block, 8, 4) - map_public_ip_on_launch = false - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_internet_gateway" "CSITGW" { - depends_on = [ - aws_vpc.CSITVPC - ] - vpc_id = aws_vpc.CSITVPC.id - - tags = { - "Environment" = var.environment_name - } -} - -# SSH keypair -# Temporary key for provisioning only -resource "tls_private_key" "CSITTLS" { - algorithm = "RSA" - ecdsa_curve = "P521" - rsa_bits = 4096 -} - -resource "aws_key_pair" "CSITKP" { - key_name = "${var.resources_name_prefix}_${var.testbed_name}-key" - public_key = "${tls_private_key.CSITTLS.public_key_openssh}" -} - -resource "aws_placement_group" "CSITPG" { - name = "${var.resources_name_prefix}_${var.testbed_name}-pg" - strategy = "cluster" -} - -# NICs -resource "aws_network_interface" "dut1_if1" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.b, - aws_instance.dut1 - ] - private_ip = var.dut1_if1_ip - private_ips = [var.dut1_if1_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.b.id - - attachment { - instance = aws_instance.dut1.id - device_index = 1 - } - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_network_interface" "dut1_if2" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.c, - aws_instance.dut1 - ] - private_ip = var.dut1_if2_ip - private_ips = [var.dut1_if2_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.c.id - - attachment { - instance = aws_instance.dut1.id - device_index = 2 - } - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_network_interface" "dut2_if1" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.c, - aws_instance.dut2 - ] - private_ip = var.dut2_if1_ip - private_ips = [var.dut2_if1_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.c.id - - attachment { - instance = aws_instance.dut2.id - device_index = 1 - } - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_network_interface" "dut2_if2" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.d, - aws_instance.dut2 - ] - private_ip = var.dut2_if2_ip - private_ips = [var.dut2_if2_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.d.id - - attachment { - instance = aws_instance.dut2.id - device_index = 2 - } - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_network_interface" "tg_if1" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.b, - aws_instance.tg - ] - private_ip = var.tg_if1_ip - private_ips = [var.tg_if1_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.b.id - - attachment { - instance = aws_instance.tg.id - device_index = 1 - } - - tags = { - "Environment" = var.environment_name - } -} - -resource "aws_network_interface" "tg_if2" { - depends_on = [ - aws_vpc.CSITVPC, - aws_subnet.d, - aws_instance.tg - ] - private_ip = var.tg_if2_ip - private_ips = [var.tg_if2_ip] - security_groups = [aws_security_group.CSITSG.id] - source_dest_check = false - subnet_id = aws_subnet.d.id - - attachment { - instance = aws_instance.tg.id - device_index = 2 - } - - tags = { - "Environment" = var.environment_name - } -} - -data "aws_network_interface" "dut1_if1" { - id = aws_network_interface.dut1_if1.id -} - -data "aws_network_interface" "dut1_if2" { - id = aws_network_interface.dut1_if2.id -} - -data "aws_network_interface" "dut2_if1" { - id = aws_network_interface.dut2_if1.id -} - -data "aws_network_interface" "dut2_if2" { - id = aws_network_interface.dut2_if2.id -} - -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 -} - -# Instances -resource "aws_instance" "tg" { - depends_on = [ - aws_vpc.CSITVPC, - aws_placement_group.CSITPG, - aws_security_group.CSITSG - ] - ami = var.ami_image_tg - availability_zone = var.avail_zone - associate_public_ip_address = true - instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior - instance_type = var.instance_type - key_name = aws_key_pair.CSITKP.key_name - placement_group = aws_placement_group.CSITPG.id - private_ip = var.tg_mgmt_ip - source_dest_check = false - subnet_id = aws_subnet.mgmt.id - vpc_security_group_ids = [aws_security_group.CSITSG.id] - # host_id = "1" - -# root_block_device { -# volume_size = 50 -# } - - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-tg" - "Environment" = var.environment_name - } -} - -resource "aws_instance" "dut1" { - depends_on = [ - aws_vpc.CSITVPC, - aws_placement_group.CSITPG, - aws_instance.tg - ] - ami = var.ami_image_sut - availability_zone = var.avail_zone - associate_public_ip_address = true - instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior - instance_type = var.instance_type - key_name = aws_key_pair.CSITKP.key_name - placement_group = aws_placement_group.CSITPG.id - private_ip = var.dut1_mgmt_ip - source_dest_check = false - subnet_id = aws_subnet.mgmt.id - vpc_security_group_ids = [aws_security_group.CSITSG.id] - # host_id = "2" - -# root_block_device { -# volume_size = 50 -# } - - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-dut1" - "Environment" = var.environment_name - } -} - -resource "aws_instance" "dut2" { - depends_on = [ - aws_vpc.CSITVPC, - aws_placement_group.CSITPG, - aws_instance.tg, - aws_instance.dut1 - ] - ami = var.ami_image_sut - availability_zone = var.avail_zone - associate_public_ip_address = true - instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior - instance_type = var.instance_type - key_name = aws_key_pair.CSITKP.key_name - placement_group = aws_placement_group.CSITPG.id - private_ip = var.dut2_mgmt_ip - source_dest_check = false - subnet_id = aws_subnet.mgmt.id - vpc_security_group_ids = [aws_security_group.CSITSG.id] - # host_id = "3" - -# root_block_device { -# volume_size = 50 -# } - - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-dut2" - "Environment" = var.environment_name - } -} - -# Routes -resource "aws_route" "CSIT-igw" { - depends_on = [ - aws_vpc.CSITVPC, - aws_internet_gateway.CSITGW - ] - destination_cidr_block = "0.0.0.0/0" - destination_ipv6_cidr_block = "::/0" - gateway_id = aws_internet_gateway.CSITGW.id - route_table_id = aws_vpc.CSITVPC.main_route_table_id -} - -resource "aws_route" "dummy-trex-port-0" { - depends_on = [ - aws_vpc.CSITVPC, - aws_instance.dut1 - ] - destination_cidr_block = var.trex_dummy_cidr_port_0 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = aws_vpc.CSITVPC.main_route_table_id -} - -resource "aws_route" "dummy-trex-port-1" { - depends_on = [ - aws_vpc.CSITVPC, - aws_instance.dut1 - ] - destination_cidr_block = var.trex_dummy_cidr_port_1 - network_interface_id = aws_instance.tg.primary_network_interface_id - route_table_id = aws_vpc.CSITVPC.main_route_table_id -} - -# Deployment/Ansible -resource "null_resource" "deploy_tg" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.dut1, - aws_network_interface.dut1_if1, - aws_network_interface.dut1_if2, - aws_instance.dut2, - aws_network_interface.dut2_if1, - aws_network_interface.dut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = tls_private_key.CSITTLS.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } - -# provisioner "ansible" { -# plays { -# playbook { -# file_path = var.ansible_file_path -# force_handlers = true -# } -# hosts = ["tg_aws"] -# extra_vars = { -# ansible_ssh_pass = var.ansible_provision_pwd -# ansible_python_interpreter = var.ansible_python_executable -# aws = true -# } -# } -# } -# -# provisioner "remote-exec" { -# on_failure = continue -# inline = ["sudo reboot"] -# } -} - -resource "null_resource" "deploy_dut1" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.dut1, - aws_network_interface.dut1_if1, - aws_network_interface.dut1_if2, - aws_instance.dut2, - aws_network_interface.dut2_if1, - aws_network_interface.dut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.dut1.public_ip - private_key = tls_private_key.CSITTLS.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } - -# provisioner "ansible" { -# plays { -# playbook { -# file_path = var.ansible_file_path -# force_handlers = true -# } -# hosts = ["sut_aws"] -# extra_vars = { -# ansible_ssh_pass = var.ansible_provision_pwd -# ansible_python_interpreter = var.ansible_python_executable -# aws = true -# } -# } -# } -# -# provisioner "remote-exec" { -# on_failure = continue -# inline = ["sudo reboot"] -# } -} - -resource "null_resource" "deploy_dut2" { - depends_on = [ - aws_instance.tg, - aws_network_interface.tg_if1, - aws_network_interface.tg_if2, - aws_instance.dut1, - aws_network_interface.dut1_if1, - aws_network_interface.dut1_if2, - aws_instance.dut2, - aws_network_interface.dut2_if1, - aws_network_interface.dut2_if2 - ] - - connection { - user = "ubuntu" - host = aws_instance.dut2.public_ip - private_key = tls_private_key.CSITTLS.private_key_pem - } - - provisioner "remote-exec" { - inline = var.first_run_commands - } - -# provisioner "ansible" { -# plays { -# playbook { -# file_path = var.ansible_file_path -# force_handlers = true -# } -# hosts = ["sut_aws"] -# extra_vars = { -# ansible_ssh_pass = var.ansible_provision_pwd -# ansible_python_interpreter = var.ansible_python_executable -# aws = true -# } -# } -# } -# -# provisioner "remote-exec" { -# on_failure = continue -# inline = ["sudo reboot"] -# } -} - -resource "null_resource" "deploy_topology" { - depends_on = [ - aws_instance.tg, - aws_instance.dut1, - aws_instance.dut2 - ] - - provisioner "ansible" { - plays { - playbook { - file_path = var.ansible_topology_path - } - hosts = ["local"] - extra_vars = { - ansible_python_interpreter = var.ansible_python_executable - testbed_name = var.testbed_name - cloud_topology = var.topology_name - 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.dut1_if1.mac_address - dut1_if2_mac = data.aws_network_interface.dut1_if2.mac_address - dut2_if1_mac = data.aws_network_interface.dut2_if1.mac_address - dut2_if2_mac = data.aws_network_interface.dut2_if2.mac_address - tg_public_ip = aws_instance.tg.public_ip - dut1_public_ip = aws_instance.dut1.public_ip - dut2_public_ip = aws_instance.dut2.public_ip - public_ip_list = "${aws_instance.tg.public_ip},${aws_instance.dut1.public_ip},${aws_instance.dut2.public_ip}" - } - } - } -} diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/providers.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/providers.tf deleted file mode 100644 index 38244af0bd..0000000000 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/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.28:8200" - skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" -}
\ No newline at end of file diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf deleted file mode 100644 index 543599f216..0000000000 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf +++ /dev/null @@ -1,180 +0,0 @@ -variable "region" { - description = "AWS Region" - type = string -} - -variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio" -} - -variable "ami_image_tg" { - description = "AWS AMI image name for TG" - type = string -} - -variable "ami_image_sut" { - description = "AWS AMI image name for SUT" - type = string -} - -variable "testbed_name" { - description = "Testbed name" - type = string -} - -variable "instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance" - type = string - default = "terminate" -} - -variable "instance_type" { - description = "AWS instance type" - type = string -} - -variable "avail_zone" { - description = "AWS availability zone" - type = string -} - -variable "topology_name" { - description = "Prefix used when creating a topology file" - type = string - default = "3n_aws_c5n" -} - -variable "environment_name" { - description = "Environment name - used for Environment tag" - type = string - default = "CSIT-AWS" -} - -variable "resources_name_prefix" { - description = "Resource prefix - used for Name tag" - type = string - default = "CSIT_3n_aws_c5n" -} - -variable "first_run_commands" { - description = "Commands to run after deployment via remote-exec" - type = list(string) - default = [""] -} - -variable "ansible_file_path" { - description = "Path to Ansible playbook" - type = string - default = "../../fdio.infra.ansible/site.yaml" -} - -variable "ansible_python_executable" { - description = "Path to Python interpreter" - type = string - default = "/usr/bin/python3" -} - -variable "ansible_topology_path" { - description = "Path to Ansible playbook which creates a topology file" - type = string - default = "../../fdio.infra.ansible/cloud_topology.yaml" -} - -variable "ansible_provision_pwd" { - description = "Password used for ansible provisioning (ansible_ssh_pass)" - type = string - default = "Csit1234" -} - -# Base VPC CIDRs -variable "vpc_cidr_mgmt" { - description = "Management CIDR block" - type = string - default = "192.168.0.0/24" -} - -variable "vpc_cidr_b" { - description = "CIDR block B" - type = string - default = "192.168.10.0/24" -} - -variable "vpc_cidr_c" { - description = "CIDR block C" - type = string - default = "200.0.0.0/24" -} - -variable "vpc_cidr_d" { - description = "CIDR block D" - type = string - default = "192.168.20.0/24" -} - -# Trex Dummy CIDRs -variable "trex_dummy_cidr_port_0" { - description = "TREX dummy CIDR" - type = string - default = "10.0.0.0/24" -} - -variable "trex_dummy_cidr_port_1" { - description = "TREX dummy CIDR" - type = string - default = "20.0.0.0/24" -} - -# IPs -variable "tg_if1_ip" { - description = "TG IP on interface 1" - type = string - default = "192.168.10.254" -} - -variable "tg_if2_ip" { - description = "TG IP on interface 2" - type = string - default = "192.168.20.254" -} - -variable "dut1_if1_ip" { - description = "DUT IP on interface 1" - type = string - default = "192.168.10.11" -} - -variable "dut1_if2_ip" { - description = "DUT IP on interface 2" - type = string - default = "200.0.0.101" -} - -variable "dut2_if1_ip" { - description = "DUT2 IP on interface 1" - type = string - default = "200.0.0.102" -} - -variable "dut2_if2_ip" { - description = "DUT2 IP on interface 2" - type = string - default = "192.168.20.11" -} - -variable "tg_mgmt_ip" { - description = "TG management interface IP" - type = string - default = "192.168.0.10" -} - -variable "dut1_mgmt_ip" { - description = "DUT1 management interface IP" - type = string - default = "192.168.0.11" -} - -variable "dut2_mgmt_ip" { - description = "DUT2 management interface IP" - type = string - default = "192.168.0.12" -} diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/versions.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/versions.tf deleted file mode 100644 index 3d1a975ea7..0000000000 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/versions.tf +++ /dev/null @@ -1,20 +0,0 @@ -terraform { - required_providers { - aws = { - source = "hashicorp/aws" - version = "~> 3.61.0" - } - null = { - source = "hashicorp/null" - version = "~> 3.1.0" - } - tls = { - source = "hashicorp/tls" - version = "~> 3.1.0" - } - vault = { - version = ">=2.22.1" - } - } - required_version = ">= 1.0.3" -} diff --git a/fdio.infra.terraform/3n_aws_c5n/main.tf b/fdio.infra.terraform/3n_aws_c5n/main.tf deleted file mode 100644 index 6501b6852e..0000000000 --- a/fdio.infra.terraform/3n_aws_c5n/main.tf +++ /dev/null @@ -1,57 +0,0 @@ -module "deploy" { - source = "./deploy" - - # Parameters starting with var. can be set using "TF_VAR_*" environment - # variables or -var parameter when running "terraform apply", for default - # values see ./variables.tf - testbed_name = var.testbed_name - topology_name = var.topology_name - environment_name = var.environment_name - resources_name_prefix = var.resources_name_prefix - - # AWS general - region = var.region - avail_zone = var.avail_zone - instance_type = var.instance_type - ami_image_tg = var.ami_image_tg - ami_image_sut = var.ami_image_sut - - # AWS Network - vpc_cidr_mgmt = "192.168.0.0/24" - vpc_cidr_b = "192.168.10.0/24" - vpc_cidr_c = "200.0.0.0/24" - vpc_cidr_d = "192.168.20.0/24" - - tg_mgmt_ip = "192.168.0.10" - dut1_mgmt_ip = "192.168.0.11" - dut2_mgmt_ip = "192.168.0.12" - - tg_if1_ip = "192.168.10.254" - tg_if2_ip = "192.168.20.254" - dut1_if1_ip = "192.168.10.11" - dut1_if2_ip = "200.0.0.101" - dut2_if1_ip = "200.0.0.102" - dut2_if2_ip = "192.168.20.11" - - trex_dummy_cidr_port_0 = "10.0.0.0/16" - trex_dummy_cidr_port_1 = "20.0.0.0/16" - - # Ansible - ansible_python_executable = "/usr/bin/python3" - ansible_file_path = "../../fdio.infra.ansible/site.yaml" - ansible_topology_path = "../../fdio.infra.ansible/cloud_topology.yaml" - ansible_provision_pwd = "Csit1234" - - # First run - # TODO: Remove the testuser creation when added to user_add ansible role - first_run_commands = [ - "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" - ] -} diff --git a/fdio.infra.terraform/3n_aws_c5n/variables.tf b/fdio.infra.terraform/3n_aws_c5n/variables.tf deleted file mode 100644 index 9e47b26295..0000000000 --- a/fdio.infra.terraform/3n_aws_c5n/variables.tf +++ /dev/null @@ -1,67 +0,0 @@ -variable "region" { - description = "AWS Region" - type = string - default = "eu-central-1" -} - -variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio" -} - -variable "avail_zone" { - description = "AWS availability zone" - type = string - default = "eu-central-1a" -} - -variable "ami_image_tg" { - # eu-central-1/focal-20.04-amd64-hvm-ssd-20210119.1 - # kernel 5.4.0-1035-aws (~5.4.0-65) - description = "AWS AMI image ID" - type = string - default = "ami-0c2d02d48236a23dd" -} - -variable "ami_image_sut" { - # eu-central-1/focal-20.04-amd64-hvm-ssd-20210119.1 - # kernel 5.4.0-1035-aws (~5.4.0-65) - description = "AWS AMI image ID" - type = string - default = "ami-05ea90e57d2df4368" -} - -variable "instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance" - type = string - default = "terminate" -} - -variable "instance_type" { - description = "AWS instance type" - type = string - default = "c5n.4xlarge" -} - -variable "testbed_name" { - description = "Testbed name" - type = string - default = "testbed1" -} - -variable "topology_name" { - description = "Topology name" - type = string - default = "3n_aws_c5n" -} - -variable "environment_name" { - description = "Environment name" - type = string - default = "CSIT-AWS" -} - -variable "resources_name_prefix" { - description = "Resources name prefix" - type = string - default = "CSIT_3n_aws_c5n" -} diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/versions.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/versions.tf index 2592550224..0eead1fc01 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/versions.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/versions.tf @@ -16,5 +16,5 @@ terraform { version = ">=2.22.1" } } - required_version = ">= 1.1.4" + required_version = ">= 1.0.4" } |