From 80a4b408b1bec92f51813c5b758d7b2739f665ed Mon Sep 17 00:00:00 2001 From: pmikus Date: Tue, 7 Sep 2021 07:01:36 +0000 Subject: Terraform: Cleanup + Use terraform fmt to format Signed-off-by: pmikus Change-Id: I32bd2f81c5838722506d44a8ff8ab48da204643a --- fdio.infra.terraform/3n_aws_c5n/deploy/main.tf | 368 ++++++++++----------- .../3n_aws_c5n/deploy/providers.tf | 6 +- .../3n_aws_c5n/deploy/variables.tf | 166 +++++----- fdio.infra.terraform/3n_aws_c5n/deploy/versions.tf | 22 +- fdio.infra.terraform/3n_aws_c5n/main.tf | 50 +-- fdio.infra.terraform/3n_aws_c5n/variables.tf | 36 +- 6 files changed, 324 insertions(+), 324 deletions(-) (limited to 'fdio.infra.terraform/3n_aws_c5n') diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf index 5201990c09..0969ca4abf 100644 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf +++ b/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf @@ -1,264 +1,264 @@ data "vault_aws_access_credentials" "creds" { - backend = "${var.vault-name}-path" - role = "${var.vault-name}-role" + backend = "${var.vault-name}-path" + role = "${var.vault-name}-role" } resource "aws_vpc" "CSITVPC" { - cidr_block = var.vpc_cidr_mgmt + cidr_block = var.vpc_cidr_mgmt - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-vpc" - "Environment" = var.environment_name + tags = { + "Name" = "${var.resources_name_prefix}_${var.testbed_name}-vpc" + "Environment" = var.environment_name } } resource "aws_security_group" "CSITSG" { - name = "${var.resources_name_prefix}_${var.testbed_name}-sg" - description = "Allow inbound traffic" - vpc_id = aws_vpc.CSITVPC.id - depends_on = [aws_vpc.CSITVPC] + name = "${var.resources_name_prefix}_${var.testbed_name}-sg" + description = "Allow inbound traffic" + vpc_id = aws_vpc.CSITVPC.id + depends_on = [aws_vpc.CSITVPC] ingress { - from_port = 22 - to_port = 22 - protocol = "tcp" - cidr_blocks = ["0.0.0.0/0"] + from_port = 22 + to_port = 22 + protocol = "tcp" + cidr_blocks = ["0.0.0.0/0"] } ingress { - from_port = 0 - to_port = 0 - protocol = -1 - self = true + from_port = 0 + to_port = 0 + protocol = -1 + self = true } egress { - from_port = 0 - to_port = 0 - protocol = "-1" - cidr_blocks = ["0.0.0.0/0"] + from_port = 0 + to_port = 0 + protocol = "-1" + cidr_blocks = ["0.0.0.0/0"] } - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-sg" - "Environment" = var.environment_name + tags = { + "Name" = "${var.resources_name_prefix}_${var.testbed_name}-sg" + "Environment" = var.environment_name } } resource "aws_vpc_ipv4_cidr_block_association" "b" { - vpc_id = aws_vpc.CSITVPC.id - cidr_block = var.vpc_cidr_b - depends_on = [aws_vpc.CSITVPC] + vpc_id = aws_vpc.CSITVPC.id + cidr_block = var.vpc_cidr_b + depends_on = [aws_vpc.CSITVPC] } resource "aws_vpc_ipv4_cidr_block_association" "c" { - vpc_id = aws_vpc.CSITVPC.id - cidr_block = var.vpc_cidr_c - depends_on = [aws_vpc.CSITVPC] + vpc_id = aws_vpc.CSITVPC.id + cidr_block = var.vpc_cidr_c + depends_on = [aws_vpc.CSITVPC] } resource "aws_vpc_ipv4_cidr_block_association" "d" { - vpc_id = aws_vpc.CSITVPC.id - cidr_block = var.vpc_cidr_d - depends_on = [aws_vpc.CSITVPC] + vpc_id = aws_vpc.CSITVPC.id + cidr_block = var.vpc_cidr_d + depends_on = [aws_vpc.CSITVPC] } # Subnets resource "aws_subnet" "mgmt" { - vpc_id = aws_vpc.CSITVPC.id - cidr_block = var.vpc_cidr_mgmt - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSITVPC] + vpc_id = aws_vpc.CSITVPC.id + cidr_block = var.vpc_cidr_mgmt + availability_zone = var.avail_zone + depends_on = [aws_vpc.CSITVPC] - tags = { - "Environment" = var.environment_name + tags = { + "Environment" = var.environment_name } } resource "aws_subnet" "b" { - vpc_id = aws_vpc.CSITVPC.id - cidr_block = var.vpc_cidr_b - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.b] + vpc_id = aws_vpc.CSITVPC.id + cidr_block = var.vpc_cidr_b + availability_zone = var.avail_zone + depends_on = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.b] - tags = { - "Environment" = var.environment_name + tags = { + "Environment" = var.environment_name } } resource "aws_subnet" "c" { - vpc_id = aws_vpc.CSITVPC.id - cidr_block = var.vpc_cidr_c - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.c] + vpc_id = aws_vpc.CSITVPC.id + cidr_block = var.vpc_cidr_c + availability_zone = var.avail_zone + depends_on = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.c] - tags = { - "Environment" = var.environment_name + tags = { + "Environment" = var.environment_name } } resource "aws_subnet" "d" { - vpc_id = aws_vpc.CSITVPC.id - cidr_block = var.vpc_cidr_d - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.d] + vpc_id = aws_vpc.CSITVPC.id + cidr_block = var.vpc_cidr_d + availability_zone = var.avail_zone + depends_on = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.d] - tags = { - "Environment" = var.environment_name + tags = { + "Environment" = var.environment_name } } resource "aws_internet_gateway" "CSITGW" { - vpc_id = aws_vpc.CSITVPC.id - depends_on = [aws_vpc.CSITVPC] + vpc_id = aws_vpc.CSITVPC.id + depends_on = [aws_vpc.CSITVPC] - tags = { - "Environment" = var.environment_name + tags = { + "Environment" = var.environment_name } } # SSH keypair # Temporary key for provisioning only resource "tls_private_key" "CSITTLS" { - algorithm = "RSA" - rsa_bits = 4096 + algorithm = "RSA" + rsa_bits = 4096 } resource "aws_key_pair" "CSITKP" { - key_name = "CSIT_3n_aws_c5n_${var.testbed_name}-key" - public_key = tls_private_key.CSITTLS.public_key_openssh + key_name = "CSIT_3n_aws_c5n_${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" + name = "${var.resources_name_prefix}_${var.testbed_name}-pg" + strategy = "cluster" } # NICs resource "aws_network_interface" "dut1_if1" { - subnet_id = aws_subnet.b.id - source_dest_check = false - private_ip = var.dut1_if1_ip - private_ips = [var.dut1_if1_ip] - security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.dut1] + subnet_id = aws_subnet.b.id + source_dest_check = false + private_ip = var.dut1_if1_ip + private_ips = [var.dut1_if1_ip] + security_groups = [aws_security_group.CSITSG.id] + depends_on = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.dut1] attachment { - instance = aws_instance.dut1.id - device_index = 1 + instance = aws_instance.dut1.id + device_index = 1 } - tags = { - "Environment" = var.environment_name + tags = { + "Environment" = var.environment_name } } resource "aws_network_interface" "dut1_if2" { - subnet_id = aws_subnet.c.id - source_dest_check = false - private_ip = var.dut1_if2_ip - private_ips = [var.dut1_if2_ip] - security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC, aws_subnet.c, aws_instance.dut1] + subnet_id = aws_subnet.c.id + source_dest_check = false + private_ip = var.dut1_if2_ip + private_ips = [var.dut1_if2_ip] + security_groups = [aws_security_group.CSITSG.id] + depends_on = [aws_vpc.CSITVPC, aws_subnet.c, aws_instance.dut1] attachment { - instance = aws_instance.dut1.id - device_index = 2 + instance = aws_instance.dut1.id + device_index = 2 } - tags = { - "Environment" = var.environment_name + tags = { + "Environment" = var.environment_name } } resource "aws_network_interface" "dut2_if1" { - subnet_id = aws_subnet.c.id - source_dest_check = false - private_ip = var.dut2_if1_ip - private_ips = [var.dut2_if1_ip] - security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC, aws_subnet.c, aws_instance.dut2] + subnet_id = aws_subnet.c.id + source_dest_check = false + private_ip = var.dut2_if1_ip + private_ips = [var.dut2_if1_ip] + security_groups = [aws_security_group.CSITSG.id] + depends_on = [aws_vpc.CSITVPC, aws_subnet.c, aws_instance.dut2] attachment { - instance = aws_instance.dut2.id - device_index = 1 + instance = aws_instance.dut2.id + device_index = 1 } - tags = { - "Environment" = var.environment_name + tags = { + "Environment" = var.environment_name } } resource "aws_network_interface" "dut2_if2" { - subnet_id = aws_subnet.d.id - source_dest_check = false - private_ip = var.dut2_if2_ip - private_ips = [var.dut2_if2_ip] - security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.dut2] + subnet_id = aws_subnet.d.id + source_dest_check = false + private_ip = var.dut2_if2_ip + private_ips = [var.dut2_if2_ip] + security_groups = [aws_security_group.CSITSG.id] + depends_on = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.dut2] attachment { - instance = aws_instance.dut2.id - device_index = 2 + instance = aws_instance.dut2.id + device_index = 2 } - tags = { - "Environment" = var.environment_name + tags = { + "Environment" = var.environment_name } } resource "aws_network_interface" "tg_if1" { - subnet_id = aws_subnet.b.id - source_dest_check = false - private_ip = var.tg_if1_ip - private_ips = [var.tg_if1_ip] - security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.tg] + subnet_id = aws_subnet.b.id + source_dest_check = false + private_ip = var.tg_if1_ip + private_ips = [var.tg_if1_ip] + security_groups = [aws_security_group.CSITSG.id] + depends_on = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.tg] attachment { - instance = aws_instance.tg.id - device_index = 1 + instance = aws_instance.tg.id + device_index = 1 } tags = { - "Environment" = var.environment_name + "Environment" = var.environment_name } } resource "aws_network_interface" "tg_if2" { - subnet_id = aws_subnet.d.id - source_dest_check = false - private_ip = var.tg_if2_ip - private_ips = [var.tg_if2_ip] - security_groups = [aws_security_group.CSITSG.id] - depends_on = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.tg] + subnet_id = aws_subnet.d.id + source_dest_check = false + private_ip = var.tg_if2_ip + private_ips = [var.tg_if2_ip] + security_groups = [aws_security_group.CSITSG.id] + depends_on = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.tg] attachment { - instance = aws_instance.tg.id - device_index = 2 + instance = aws_instance.tg.id + device_index = 2 } tags = { - "Environment" = var.environment_name + "Environment" = var.environment_name } } data "aws_network_interface" "dut1_if1" { - id = aws_network_interface.dut1_if1.id + id = aws_network_interface.dut1_if1.id } data "aws_network_interface" "dut1_if2" { - id = aws_network_interface.dut1_if2.id + id = aws_network_interface.dut1_if2.id } data "aws_network_interface" "dut2_if1" { - id = aws_network_interface.dut2_if1.id + id = aws_network_interface.dut2_if1.id } data "aws_network_interface" "dut2_if2" { - id = aws_network_interface.dut2_if2.id + id = aws_network_interface.dut2_if2.id } data "aws_network_interface" "tg_if1" { - id = aws_network_interface.tg_if1.id + id = aws_network_interface.tg_if1.id } data "aws_network_interface" "tg_if2" { - id = aws_network_interface.tg_if2.id + id = aws_network_interface.tg_if2.id } # Instances @@ -276,18 +276,18 @@ resource "aws_instance" "tg" { source_dest_check = false # host_id = "1" - depends_on = [ + depends_on = [ aws_vpc.CSITVPC, aws_placement_group.CSITPG, ] root_block_device { - volume_size = 50 + volume_size = 50 } - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-tg" - "Environment" = var.environment_name + tags = { + "Name" = "${var.resources_name_prefix}_${var.testbed_name}-tg" + "Environment" = var.environment_name } } @@ -305,19 +305,19 @@ resource "aws_instance" "dut1" { source_dest_check = false # host_id = "2" - depends_on = [ + depends_on = [ aws_vpc.CSITVPC, aws_placement_group.CSITPG, aws_instance.tg ] root_block_device { - volume_size = 50 + volume_size = 50 } - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-dut1" - "Environment" = var.environment_name + tags = { + "Name" = "${var.resources_name_prefix}_${var.testbed_name}-dut1" + "Environment" = var.environment_name } } @@ -334,7 +334,7 @@ resource "aws_instance" "dut2" { source_dest_check = false # host_id = "3" - depends_on = [ + depends_on = [ aws_vpc.CSITVPC, aws_placement_group.CSITPG, aws_instance.tg, @@ -342,12 +342,12 @@ resource "aws_instance" "dut2" { ] root_block_device { - volume_size = 50 + volume_size = 50 } - tags = { - "Name" = "${var.resources_name_prefix}_${var.testbed_name}-dut2" - "Environment" = var.environment_name + tags = { + "Name" = "${var.resources_name_prefix}_${var.testbed_name}-dut2" + "Environment" = var.environment_name } } @@ -373,7 +373,7 @@ resource "aws_route" "dummy-trex-port-1" { # Deployment/Ansible resource "null_resource" "deploy_tg" { - depends_on = [ + depends_on = [ aws_instance.tg, aws_network_interface.tg_if1, aws_network_interface.tg_if2, @@ -386,23 +386,23 @@ resource "null_resource" "deploy_tg" { ] connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = tls_private_key.CSITTLS.private_key_pem + 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 + inline = var.first_run_commands } provisioner "ansible" { plays { playbook { - file_path = var.ansible_file_path - force_handlers = true + file_path = var.ansible_file_path + force_handlers = true } - hosts = ["tg_aws"] - extra_vars = { + hosts = ["tg_aws"] + extra_vars = { ansible_ssh_pass = var.ansible_provision_pwd ansible_python_interpreter = var.ansible_python_executable aws = true @@ -411,13 +411,13 @@ resource "null_resource" "deploy_tg" { } provisioner "remote-exec" { - on_failure = continue - inline = ["sudo reboot"] + on_failure = continue + inline = ["sudo reboot"] } } resource "null_resource" "deploy_dut1" { - depends_on = [ + depends_on = [ aws_instance.tg, aws_network_interface.tg_if1, aws_network_interface.tg_if2, @@ -430,23 +430,23 @@ resource "null_resource" "deploy_dut1" { ] connection { - user = "ubuntu" - host = aws_instance.dut1.public_ip - private_key = tls_private_key.CSITTLS.private_key_pem + 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 + inline = var.first_run_commands } provisioner "ansible" { plays { playbook { - file_path = var.ansible_file_path - force_handlers = true + file_path = var.ansible_file_path + force_handlers = true } - hosts = ["sut_aws"] - extra_vars = { + hosts = ["sut_aws"] + extra_vars = { ansible_ssh_pass = var.ansible_provision_pwd ansible_python_interpreter = var.ansible_python_executable aws = true @@ -455,13 +455,13 @@ resource "null_resource" "deploy_dut1" { } provisioner "remote-exec" { - on_failure = continue - inline = ["sudo reboot"] + on_failure = continue + inline = ["sudo reboot"] } } resource "null_resource" "deploy_dut2" { - depends_on = [ + depends_on = [ aws_instance.tg, aws_network_interface.tg_if1, aws_network_interface.tg_if2, @@ -474,23 +474,23 @@ resource "null_resource" "deploy_dut2" { ] connection { - user = "ubuntu" - host = aws_instance.dut2.public_ip - private_key = tls_private_key.CSITTLS.private_key_pem + 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 + inline = var.first_run_commands } provisioner "ansible" { plays { playbook { - file_path = var.ansible_file_path - force_handlers = true + file_path = var.ansible_file_path + force_handlers = true } - hosts = ["sut_aws"] - extra_vars = { + hosts = ["sut_aws"] + extra_vars = { ansible_ssh_pass = var.ansible_provision_pwd ansible_python_interpreter = var.ansible_python_executable aws = true @@ -499,21 +499,21 @@ resource "null_resource" "deploy_dut2" { } provisioner "remote-exec" { - on_failure = continue - inline = ["sudo reboot"] + on_failure = continue + inline = ["sudo reboot"] } } resource "null_resource" "deploy_topology" { - depends_on = [ aws_instance.tg, aws_instance.dut1, aws_instance.dut2 ] + depends_on = [aws_instance.tg, aws_instance.dut1, aws_instance.dut2] provisioner "ansible" { plays { playbook { - file_path = var.ansible_topology_path + file_path = var.ansible_topology_path } - hosts = ["local"] - extra_vars = { + hosts = ["local"] + extra_vars = { ansible_python_interpreter = var.ansible_python_executable testbed_name = var.testbed_name cloud_topology = var.topology_name diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/providers.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/providers.tf index a74ebb2455..38244af0bd 100644 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/providers.tf +++ b/fdio.infra.terraform/3n_aws_c5n/deploy/providers.tf @@ -1,7 +1,7 @@ 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 + 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" { diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf index 735e6c6dd8..aa784622d7 100644 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf +++ b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf @@ -1,163 +1,163 @@ variable "region" { - description = "AWS Region" - type = string + description = "AWS Region" + type = string } variable "vault-name" { - default = "dynamic-aws-creds-vault-admin" + default = "dynamic-aws-creds-vault-admin" } variable "ami_image" { - description = "AWS AMI image name" - type = string + description = "AWS AMI image name" + type = string } variable "testbed_name" { - description = "Testbed name" - type = string + description = "Testbed name" + type = string } variable "instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance" - type = string - default = "terminate" + description = "Shutdown behavior for the instance" + type = string + default = "terminate" } variable "instance_type" { - description = "AWS instance type" - type = string + description = "AWS instance type" + type = string } variable "avail_zone" { - description = "AWS availability zone" - type = string + description = "AWS availability zone" + type = string } variable "topology_name" { - description = "Prefix used when creating a topology file" - type = string - default = "3n_aws_c5n" + 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" + 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" + 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 = [""] + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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 index 05fa5502b5..03ae56c8ff 100644 --- a/fdio.infra.terraform/3n_aws_c5n/deploy/versions.tf +++ b/fdio.infra.terraform/3n_aws_c5n/deploy/versions.tf @@ -1,19 +1,19 @@ terraform { required_providers { - aws = { - source = "hashicorp/aws" - version = "~> 3.32.0" + aws = { + source = "hashicorp/aws" + version = "~> 3.32.0" } - null = { - source = "hashicorp/null" - version = "~> 3.0.0" + null = { + source = "hashicorp/null" + version = "~> 3.0.0" } - tls = { - source = "hashicorp/tls" - version = "~> 3.0.0" + tls = { + source = "hashicorp/tls" + version = "~> 3.0.0" } - vault = { - version = ">=2.22.1" + 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 index fca5eecff3..ed87161eb5 100644 --- a/fdio.infra.terraform/3n_aws_c5n/main.tf +++ b/fdio.infra.terraform/3n_aws_c5n/main.tf @@ -1,38 +1,38 @@ module "deploy" { - source = "./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 = "3n_aws_c5n" - environment_name = "CSIT-AWS" - resources_name_prefix = "CSIT_3n_aws_c5n" + testbed_name = var.testbed_name + topology_name = "3n_aws_c5n" + environment_name = "CSIT-AWS" + resources_name_prefix = "CSIT_3n_aws_c5n" # AWS general - region = var.region - avail_zone = var.avail_zone - instance_type = var.instance_type - ami_image = var.ami_image + region = var.region + avail_zone = var.avail_zone + instance_type = var.instance_type + ami_image = var.ami_image # 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" + 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_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" + 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/24" - trex_dummy_cidr_port_1 = "20.0.0.0/24" + trex_dummy_cidr_port_0 = "10.0.0.0/24" + trex_dummy_cidr_port_1 = "20.0.0.0/24" # Ansible ansible_python_executable = "/usr/bin/python3" @@ -42,7 +42,7 @@ module "deploy" { # First run # TODO: Remove the testuser creation when added to user_add ansible role - first_run_commands = [ + 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", diff --git a/fdio.infra.terraform/3n_aws_c5n/variables.tf b/fdio.infra.terraform/3n_aws_c5n/variables.tf index d3bb8e41a5..c87b1c3cfa 100644 --- a/fdio.infra.terraform/3n_aws_c5n/variables.tf +++ b/fdio.infra.terraform/3n_aws_c5n/variables.tf @@ -1,37 +1,37 @@ variable "region" { - description = "AWS Region" - type = string - default = "eu-central-1" + description = "AWS Region" + type = string + default = "eu-central-1" } variable "avail_zone" { - description = "AWS availability zone" - type = string - default = "eu-central-1a" + description = "AWS availability zone" + type = string + default = "eu-central-1a" } variable "ami_image" { # 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-0a875db8a031a9efb" + description = "AWS AMI image ID" + type = string + default = "ami-0a875db8a031a9efb" } variable "instance_initiated_shutdown_behavior" { - description = "Shutdown behavior for the instance" - type = string - default = "terminate" + description = "Shutdown behavior for the instance" + type = string + default = "terminate" } variable "instance_type" { - description = "AWS instance type" - type = string - default = "c5n.9xlarge" + description = "AWS instance type" + type = string + default = "c5n.9xlarge" } variable "testbed_name" { - description = "Testbed name" - type = string - default = "testbed1" + description = "Testbed name" + type = string + default = "testbed1" } -- cgit 1.2.3-korg