From a678231f39f4d4ea079018e7d11be36d0cc454d2 Mon Sep 17 00:00:00 2001 From: Tomas Alexy Date: Thu, 28 Jan 2021 08:59:22 +0100 Subject: [PATCH] Infra: Fix AWS deployment Signed-off-by: Tomas Alexy Change-Id: Ie24f5fac5827e28b1ac7c22192a94994700b2910 --- .../ansible/roles/aws/tasks/main.yaml | 57 ++- .../ansible/roles/aws/tasks/ubuntu_bionic.yaml | 14 +- .../ansible/roles/calibration/defaults/main.yaml | 2 +- .../ansible/roles/topology/tasks/main.yaml | 4 +- resources/tools/testbed-setup/ansible/site.yaml | 17 +- .../tools/testbed-setup/ansible/site_aws.yaml | 8 - resources/tools/testbed-setup/ansible/sut.yaml | 26 ++ resources/tools/testbed-setup/ansible/sut_aws.yaml | 25 -- resources/tools/testbed-setup/ansible/tg.yaml | 30 ++ resources/tools/testbed-setup/ansible/tg_aws.yaml | 35 -- terraform-ci-infra/2n_aws_c5n/.gitignore | 1 + terraform-ci-infra/2n_aws_c5n/deploy/main.tf | 380 ++++++++++++++++ terraform-ci-infra/2n_aws_c5n/deploy/variables.tf | 143 ++++++ terraform-ci-infra/2n_aws_c5n/deploy/versions.tf | 17 + terraform-ci-infra/2n_aws_c5n/main.tf | 355 +++------------ terraform-ci-infra/2n_aws_c5n/nic.tf | 67 --- terraform-ci-infra/3n_aws_c5n/.gitignore | 1 + terraform-ci-infra/3n_aws_c5n/deploy/main.tf | 482 +++++++++++++++++++++ terraform-ci-infra/3n_aws_c5n/deploy/variables.tf | 158 +++++++ terraform-ci-infra/3n_aws_c5n/deploy/versions.tf | 17 + terraform-ci-infra/3n_aws_c5n/main.tf | 415 +++--------------- terraform-ci-infra/3n_aws_c5n/nic.tf | 101 ----- terraform-ci-infra/README.txt | 33 ++ 23 files changed, 1456 insertions(+), 932 deletions(-) delete mode 100644 resources/tools/testbed-setup/ansible/site_aws.yaml delete mode 100644 resources/tools/testbed-setup/ansible/sut_aws.yaml delete mode 100644 resources/tools/testbed-setup/ansible/tg_aws.yaml create mode 100644 terraform-ci-infra/2n_aws_c5n/deploy/main.tf create mode 100644 terraform-ci-infra/2n_aws_c5n/deploy/variables.tf create mode 100644 terraform-ci-infra/2n_aws_c5n/deploy/versions.tf delete mode 100644 terraform-ci-infra/2n_aws_c5n/nic.tf create mode 100644 terraform-ci-infra/3n_aws_c5n/deploy/main.tf create mode 100644 terraform-ci-infra/3n_aws_c5n/deploy/variables.tf create mode 100644 terraform-ci-infra/3n_aws_c5n/deploy/versions.tf delete mode 100644 terraform-ci-infra/3n_aws_c5n/nic.tf create mode 100644 terraform-ci-infra/README.txt diff --git a/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml index 7b7a7fbb1a..deca0670ec 100644 --- a/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/aws/tasks/main.yaml @@ -1,26 +1,40 @@ --- # file: roles/aws/tasks/main.yaml -- name: AWS - Edit repositories - include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml' - tags: edit-repo +- name: Edit repositories + include_tasks: "{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml" + tags: + - edit-repo + +- name: Get vfio-pci With WC Patcher + get_url: + url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/get-vfio-with-wc.sh" + dest: "/opt/get-vfio-with-wc.sh" + mode: "744" + tags: + - vfio-aws-patch + +- name: Create vfio-pci Patch Directory + file: + path: "/opt/patches/" + state: "directory" + tags: + - vfio-aws-patch -- name: AWS - Get vfio-pci Patcher Script +- name: Get vfio-pci WC Patch get_url: - url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/vfio-wc-patch.sh" - dest: "/opt/vfio-wc-patch.sh" + url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/patches/linux-4.10-vfio-wc.patch" + dest: "/opt/patches/linux-4.10-vfio-wc.patch" mode: "744" - register: "vfio_patch_downloaded" tags: - vfio-aws-patch -- name: AWS - Patch vfio-pci - shell: "/bin/bash /opt/vfio-wc-patch.sh" - when: "vfio_patch_downloaded" +- name: Compile vfio-pci With WC Patch + shell: "/bin/bash /opt/get-vfio-with-wc.sh" tags: - vfio-aws-patch -- name: AWS - Load Kernel Modules By Default +- name: Load Kernel Modules By Default lineinfile: path: "/etc/modules" state: "present" @@ -28,11 +42,10 @@ with_items: - "vfio-pci" - "igb_uio" - register: "modules_added" tags: - load-kernel-modules -- name: AWS - Add Kernel Modules Options +- name: Add Kernel Modules Options (igb_uio) lineinfile: path: "/etc/modprobe.d/igb_uio.conf" state: "present" @@ -40,20 +53,28 @@ create: "yes" with_items: - "options igb_uio wc_activate=1" - when: "modules_added" - register: "modules_added" tags: - load-kernel-modules -- name: AWS - Reload systemd-modules +- name: Add Kernel Modules Options (vfio-pci) + lineinfile: + path: "/etc/modprobe.d/vfio-noiommu.conf" + state: "present" + line: "{{ item }}" + create: "yes" + with_items: + - "options vfio enable_unsafe_noiommu_mode=1" + tags: + - load-kernel-modules + +- name: Reload systemd-modules systemd: name: "systemd-modules-load" state: "restarted" - when: "modules_added" tags: - reload-systemd-modules -- name: AWS - Performance Tuning - Adjust nr_hugepages +- name: Performance Tuning - Adjust nr_hugepages sysctl: name: "vm.nr_hugepages" value: "8192" diff --git a/resources/tools/testbed-setup/ansible/roles/aws/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/aws/tasks/ubuntu_bionic.yaml index 75e4a3ae57..ba6e107e45 100644 --- a/resources/tools/testbed-setup/ansible/roles/aws/tasks/ubuntu_bionic.yaml +++ b/resources/tools/testbed-setup/ansible/roles/aws/tasks/ubuntu_bionic.yaml @@ -1,10 +1,10 @@ --- -# file: roles/aws/tasks/ubuntu_bionic.yaml +# file: roles/aws/tasks/ubuntu_bionic.yaml.yaml -- name: AWS - Enable deb-src APT Repositories - replace: - path: "/etc/apt/sources.list" - regexp: "^# deb-src " - replace: "deb-src " +- name: Enable deb-src APT Repository + apt_repository: + repo: "deb-src http://archive.ubuntu.com/ubuntu bionic main" + state: "present" + update_cache: yes tags: - - enable-src-repo + - enable-src-repo \ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml index c639f11088..e5ef3c1bc1 100644 --- a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml @@ -26,7 +26,7 @@ kernel_version_by_distro_by_arch: x86_64: - "4.15.0-72-generic" - "5.3.0-1020-azure" - - "5.3.0-1017-aws" + - "4.15.0-1057-aws" aarch64: - "4.15.0-54-generic" diff --git a/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml index 9efdc71759..cf3eb5367f 100644 --- a/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml @@ -3,7 +3,7 @@ - name: Create topology file template: - src: 'templates/topology_{{ cloud_topology }}.j2' - dest: '../../../../topologies/available/{{ cloud_topology }}_testbed.yaml' + src: "templates/topology_{{ cloud_topology }}.j2" + dest: "../../../../topologies/available/{{ cloud_topology }}_{{ testbed_name }}.yaml" tags: - create-topology-file diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/resources/tools/testbed-setup/ansible/site.yaml index 5ac76ca340..1d755dbae0 100644 --- a/resources/tools/testbed-setup/ansible/site.yaml +++ b/resources/tools/testbed-setup/ansible/site.yaml @@ -2,16 +2,23 @@ # file: site.yaml - import_playbook: tg.yaml - tags: tg + tags: + - tg + - tg_aws - import_playbook: sut.yaml - tags: sut + tags: + - sut + - sut_aws - import_playbook: vpp_device.yaml - tags: vpp-device + tags: + - vpp-device - import_playbook: nomad.yaml - tags: nomad + tags: + - nomad - import_playbook: dev.yaml - tags: dev + tags: + - dev diff --git a/resources/tools/testbed-setup/ansible/site_aws.yaml b/resources/tools/testbed-setup/ansible/site_aws.yaml deleted file mode 100644 index 4e23a97f85..0000000000 --- a/resources/tools/testbed-setup/ansible/site_aws.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# file: site_aws.yaml - -- import_playbook: tg_aws.yaml - tags: tg - -- import_playbook: sut_aws.yaml - tags: sut diff --git a/resources/tools/testbed-setup/ansible/sut.yaml b/resources/tools/testbed-setup/ansible/sut.yaml index 9449316fb2..f3e8c3b57b 100644 --- a/resources/tools/testbed-setup/ansible/sut.yaml +++ b/resources/tools/testbed-setup/ansible/sut.yaml @@ -38,3 +38,29 @@ tags: cleanup - role: calibration tags: calibration + +- hosts: sut_aws + remote_user: testuser + become: yes + become_user: root + roles: + - role: user_add + tags: user_add + - role: common + tags: common + - role: vpp + tags: vpp + - role: dpdk + tags: dpdk + - role: aws + tags: aws + - role: iperf + tags: iperf + - role: docker + tags: docker + - role: cleanup + tags: cleanup + # TODO: 'Check Kernel Parameters' failing in + # resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml + # - role: calibration + # tags: calibration diff --git a/resources/tools/testbed-setup/ansible/sut_aws.yaml b/resources/tools/testbed-setup/ansible/sut_aws.yaml deleted file mode 100644 index a7642abfef..0000000000 --- a/resources/tools/testbed-setup/ansible/sut_aws.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# file: sut_aws.yaml - -- hosts: sut - become: yes - become_user: root - roles: - - role: user_add - tags: user_add - - role: common - tags: common - - role: vpp - tags: vpp - - role: dpdk - tags: dpdk - - role: aws - tags: aws - - role: iperf - tags: iperf - - role: docker - tags: docker - - role: cleanup - tags: cleanup -# - role: calibration -# tags: calibration diff --git a/resources/tools/testbed-setup/ansible/tg.yaml b/resources/tools/testbed-setup/ansible/tg.yaml index 2b375b76a1..527ccae922 100644 --- a/resources/tools/testbed-setup/ansible/tg.yaml +++ b/resources/tools/testbed-setup/ansible/tg.yaml @@ -36,3 +36,33 @@ tags: cleanup - role: calibration tags: calibration + +- hosts: tg_aws + remote_user: testuser + become: yes + become_user: root + roles: + - role: user_add + tags: user_add + - role: common + tags: common + - role: dpdk + tags: dpdk + - role: aws + tags: aws + - role: tg + tags: tg + - role: iperf + tags: iperf + - role: trex + tags: trex + - role: ab + tags: ab + - role: docker + tags: docker + - role: cleanup + tags: cleanup + # TODO: 'Check Kernel Parameters' failing in + # resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml + # - role: calibration + # tags: calibration diff --git a/resources/tools/testbed-setup/ansible/tg_aws.yaml b/resources/tools/testbed-setup/ansible/tg_aws.yaml deleted file mode 100644 index 17e8239c9e..0000000000 --- a/resources/tools/testbed-setup/ansible/tg_aws.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -# file: tg_aws.yaml - -- hosts: tg - become: yes - become_user: root - gather_facts: false - pre_tasks: - - name: Gathering Facts - gather_facts: - tags: - - always - roles: - - role: user_add - tags: user_add - - role: common - tags: common - - role: dpdk - tags: dpdk - - role: aws - tags: aws - - role: tg - tags: tg - - role: iperf - tags: iperf - - role: trex - tags: trex - - role: ab - tags: ab - - role: docker - tags: docker - - role: cleanup - tags: cleanup -# - role: calibration -# tags: calibration diff --git a/terraform-ci-infra/2n_aws_c5n/.gitignore b/terraform-ci-infra/2n_aws_c5n/.gitignore index fc64f0039f..40f77d862f 100644 --- a/terraform-ci-infra/2n_aws_c5n/.gitignore +++ b/terraform-ci-infra/2n_aws_c5n/.gitignore @@ -1,4 +1,5 @@ .terraform/ .terraform.tfstate.lock.info +.terraform.lock.hcl terraform.tfstate terraform.tfstate.backup diff --git a/terraform-ci-infra/2n_aws_c5n/deploy/main.tf b/terraform-ci-infra/2n_aws_c5n/deploy/main.tf new file mode 100644 index 0000000000..7fe815188e --- /dev/null +++ b/terraform-ci-infra/2n_aws_c5n/deploy/main.tf @@ -0,0 +1,380 @@ +provider "aws" { + region = var.region +} + +resource "aws_vpc" "CSITVPC" { + cidr_block = var.vpc_cidr_mgmt + + 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] + + ingress { + 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 + } + + egress { + 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 + } +} + +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] +} +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] +} +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] +} + +# 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] + + 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] + + 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] + + 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] + + tags = { + "Environment" = var.environment_name + } +} + +resource "aws_internet_gateway" "CSITGW" { + vpc_id = aws_vpc.CSITVPC.id + depends_on = [aws_vpc.CSITVPC] + + tags = { + "Environment" = var.environment_name + } +} + +# SSH keypair +# Temporary key for provisioning only +resource "tls_private_key" "CSITTLS" { + algorithm = "RSA" + 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" { + 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] + + attachment { + instance = aws_instance.dut1.id + device_index = 1 + } + + tags = { + "Environment" = var.environment_name + } +} + +resource "aws_network_interface" "dut1_if2" { + subnet_id = aws_subnet.d.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] + + attachment { + instance = aws_instance.dut1.id + device_index = 2 + } + + 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] + + attachment { + instance = aws_instance.tg.id + device_index = 1 + } + + tags = { + "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] + + 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" { + ami = var.ami_image + availability_zone = var.avail_zone + instance_type = var.instance_type + key_name = aws_key_pair.CSITKP.key_name + associate_public_ip_address = true + subnet_id = aws_subnet.mgmt.id + private_ip = var.tg_mgmt_ip + vpc_security_group_ids = [aws_security_group.CSITSG.id] + placement_group = aws_placement_group.CSITPG.id + source_dest_check = false + depends_on = [aws_vpc.CSITVPC, aws_placement_group.CSITPG] + # 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" { + ami = var.ami_image + availability_zone = var.avail_zone + instance_type = var.instance_type + key_name = aws_key_pair.CSITKP.key_name + associate_public_ip_address = true + subnet_id = aws_subnet.mgmt.id + private_ip = var.dut1_mgmt_ip + vpc_security_group_ids = [aws_security_group.CSITSG.id] + placement_group = aws_placement_group.CSITPG.id + source_dest_check = false + depends_on = [aws_vpc.CSITVPC, aws_placement_group.CSITPG] + # host_id = "2" + + root_block_device { + volume_size = 50 + } + + tags = { + "Name" = "${var.resources_name_prefix}_${var.testbed_name}-dut1" + "Environment" = var.environment_name + } +} + +# Routes +resource "aws_route" "CSIT-igw" { + route_table_id = aws_vpc.CSITVPC.main_route_table_id + gateway_id = aws_internet_gateway.CSITGW.id + destination_cidr_block = "0.0.0.0/0" + depends_on = [aws_vpc.CSITVPC, aws_internet_gateway.CSITGW] +} + +resource "aws_route" "dummy-trex-port-0" { + route_table_id = aws_vpc.CSITVPC.main_route_table_id + network_interface_id = aws_instance.tg.primary_network_interface_id + destination_cidr_block = var.trex_dummy_cidr_port_0 + depends_on = [aws_vpc.CSITVPC, aws_instance.dut1] +} + +resource "aws_route" "dummy-trex-port-1" { + route_table_id = aws_vpc.CSITVPC.main_route_table_id + network_interface_id = aws_instance.tg.primary_network_interface_id + destination_cidr_block = var.trex_dummy_cidr_port_1 + depends_on = [aws_vpc.CSITVPC, aws_instance.dut1] +} + +# Deployment/Ansible +resource "null_resource" "deploy_tg" { + depends_on = [ + aws_instance.tg, + aws_network_interface.tg_if1, + aws_network_interface.tg_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 + } + } + } +} + +resource "null_resource" "deploy_dut1" { + depends_on = [ + 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 + } + } + } +} + +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/terraform-ci-infra/2n_aws_c5n/deploy/variables.tf b/terraform-ci-infra/2n_aws_c5n/deploy/variables.tf new file mode 100644 index 0000000000..d1ff1d6575 --- /dev/null +++ b/terraform-ci-infra/2n_aws_c5n/deploy/variables.tf @@ -0,0 +1,143 @@ +variable "region" { + description = "AWS Region" + type = string + default = "eu-central-1" +} + +variable "ami_image" { + description = "AWS AMI image name" + type = string + default = "ami-0b418580298265d5c" +} + +variable "testbed_name" { + description = "Testbed name" + type = string + default = "testbed1" +} + +variable "topology_name" { + description = "Prefix used when creating a topology file" + type = string + default = "2n_aws_c5n" +} + +variable "instance_type" { + description = "AWS instance type" + type = string + default = "c5n.4xlarge" +} + +variable "avail_zone" { + description = "AWS availability zone" + type = string + default = "eu-central-1a" +} + +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 = "../../resources/tools/testbed-setup/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 = "../../resources/tools/testbed-setup/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/terraform-ci-infra/2n_aws_c5n/deploy/versions.tf b/terraform-ci-infra/2n_aws_c5n/deploy/versions.tf new file mode 100644 index 0000000000..2d09eb67b4 --- /dev/null +++ b/terraform-ci-infra/2n_aws_c5n/deploy/versions.tf @@ -0,0 +1,17 @@ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 3.26.0" + } + null = { + source = "hashicorp/null" + version = "~> 3.0.0" + } + tls = { + source = "hashicorp/tls" + version = "~> 3.0.0" + } + } + required_version = ">= 0.13" +} diff --git a/terraform-ci-infra/2n_aws_c5n/main.tf b/terraform-ci-infra/2n_aws_c5n/main.tf index c0da7a487e..a73288d9e8 100644 --- a/terraform-ci-infra/2n_aws_c5n/main.tf +++ b/terraform-ci-infra/2n_aws_c5n/main.tf @@ -1,304 +1,53 @@ -provider "aws" { - region = "eu-central-1" +module "deploy" { + source = "./deploy" + + # TODO: Use ENV variable for testbed_name for dynamic deployment + testbed_name = "testbed1" + topology_name = "2n_aws_c5n" + environment_name = "CSIT-AWS" + resources_name_prefix = "CSIT_2n_aws_c5n" + + # AWS general + region = "eu-central-1" + avail_zone = "eu-central-1a" + instance_type = "c5n.4xlarge" + ami_image = "ami-0b418580298265d5c" + # eu-central-1/bionic-18.04-amd64-hvm-ssd-20200112 + # kernel 4.15.0-1057-aws (~4.15.0-74) + + # 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/24" + trex_dummy_cidr_port_1 = "20.0.0.0/24" + + # Ansible + ansible_python_executable = "/usr/bin/python3" + ansible_file_path = "../../resources/tools/testbed-setup/ansible/site.yaml" + ansible_topology_path = "../../resources/tools/testbed-setup/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" + ] } - -variable "avail_zone" { - type = string - default = "eu-central-1a" -} -# Base VPC CIDRs -variable "vpc_cidr_mgmt" { - type = string - default = "192.168.0.0/24" -} -variable "vpc_cidr_b" { - type = string - default = "192.168.10.0/24" -} -variable "vpc_cidr_c" { - type = string - default = "200.0.0.0/24" -} -variable "vpc_cidr_d" { - type = string - default = "192.168.20.0/24" -} - -# Trex Dummy CIDRs -variable "trex_dummy_cidr_port_0" { - type = string - default = "10.0.0.0/24" -} -variable "trex_dummy_cidr_port_1" { - type = string - default = "20.0.0.0/24" -} - -# IPs -variable "tg_if1_ip" { - type = string - default = "192.168.10.254" -} -variable "tg_if2_ip" { - type = string - default = "192.168.20.254" -} -variable "dut1_if1_ip" { - type = string - default = "192.168.10.11" -} -variable "dut1_if2_ip" { - type = string - default = "192.168.20.11" -} -variable "tg_mgmt_ip" { - type = string - default = "192.168.0.10" -} -variable "dut1_mgmt_ip" { - type = string - default = "192.168.0.11" -} - -# Instance Type -variable "instance_type" { - type = string - default = "c5n.2xlarge" -} - -resource "aws_vpc" "CSIT" { - cidr_block = var.vpc_cidr_mgmt -} - -resource "aws_security_group" "CSIT" { - name = "CSIT" - description = "Allow inbound traffic" - vpc_id = aws_vpc.CSIT.id - - ingress { - 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 - } - - egress { - from_port = 0 - to_port = 0 - protocol = "-1" - cidr_blocks = ["0.0.0.0/0"] - } - - depends_on = [aws_vpc.CSIT] -} - -resource "aws_vpc_ipv4_cidr_block_association" "b" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_b - depends_on = [aws_vpc.CSIT] -} -resource "aws_vpc_ipv4_cidr_block_association" "c" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_c - depends_on = [aws_vpc.CSIT] -} -resource "aws_vpc_ipv4_cidr_block_association" "d" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_d - depends_on = [aws_vpc.CSIT] -} - -resource "aws_subnet" "mgmt" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_mgmt - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSIT] -} - -resource "aws_subnet" "b" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_b - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSIT, aws_vpc_ipv4_cidr_block_association.b] -} - -resource "aws_subnet" "c" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_c - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSIT, aws_vpc_ipv4_cidr_block_association.c] -} - -resource "aws_subnet" "d" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_d - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSIT, aws_vpc_ipv4_cidr_block_association.d] -} - -resource "aws_internet_gateway" "CSIT" { - vpc_id = aws_vpc.CSIT.id - depends_on = [aws_vpc.CSIT] -} - -resource "aws_key_pair" "CSIT" { - key_name = "CSIT" - public_key = file("~/.ssh/id_rsa.pub") -} - -data "aws_ami" "ubuntu" { - most_recent = true - - filter { - name = "name" - values = ["*hvm-ssd/ubuntu-bionic-18.04-amd64*"] - } - - filter { - name = "virtualization-type" - values = ["hvm"] - } - - owners = ["099720109477"] # Canonical -} - -resource "aws_placement_group" "CSIT" { - name = "CSIT" - strategy = "cluster" -} - -resource "aws_instance" "tg" { - ami = data.aws_ami.ubuntu.id - instance_type = var.instance_type -# cpu_threads_per_core = 1 -# cpu_core_count = 18 - key_name = aws_key_pair.CSIT.key_name - associate_public_ip_address = true - subnet_id = aws_subnet.mgmt.id - root_block_device { - volume_size = 50 - } - private_ip = var.tg_mgmt_ip - vpc_security_group_ids = [aws_security_group.CSIT.id] - depends_on = [aws_vpc.CSIT, aws_placement_group.CSIT] - placement_group = aws_placement_group.CSIT.id - source_dest_check = false -} - -resource "aws_instance" "dut1" { - ami = data.aws_ami.ubuntu.id -# cpu_threads_per_core = 1 -# cpu_core_count = 18 - instance_type = var.instance_type - key_name = aws_key_pair.CSIT.key_name - associate_public_ip_address = true - subnet_id = aws_subnet.mgmt.id - root_block_device { - volume_size = 50 - } - private_ip = var.dut1_mgmt_ip - vpc_security_group_ids = [aws_security_group.CSIT.id] - depends_on = [aws_vpc.CSIT, aws_placement_group.CSIT] - placement_group = aws_placement_group.CSIT.id - source_dest_check = false -} - -resource "aws_route" "CSIT-igw" { - route_table_id = aws_vpc.CSIT.main_route_table_id - gateway_id = aws_internet_gateway.CSIT.id - destination_cidr_block = "0.0.0.0/0" - depends_on = [aws_vpc.CSIT, aws_internet_gateway.CSIT] -} -resource "aws_route" "dummy-trex-port-0" { - route_table_id = aws_vpc.CSIT.main_route_table_id - network_interface_id = aws_instance.tg.primary_network_interface_id - destination_cidr_block = var.trex_dummy_cidr_port_0 - depends_on = [aws_vpc.CSIT, aws_instance.dut1] -} -resource "aws_route" "dummy-trex-port-1" { - route_table_id = aws_vpc.CSIT.main_route_table_id - network_interface_id = aws_instance.tg.primary_network_interface_id - destination_cidr_block = var.trex_dummy_cidr_port_1 - depends_on = [aws_vpc.CSIT, aws_instance.dut1] -} - -resource "null_resource" "deploy_tg" { - depends_on = [ aws_instance.tg ] - connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = file("~/.ssh/id_rsa") - } - provisioner "ansible" { - plays { - playbook { - file_path = "../../testbed-setup/ansible/site_aws.yaml" - force_handlers = true - } - hosts = ["tg"] - extra_vars = { - ansible_python_interpreter = "/usr/bin/python3" - aws = true - } - } - } -} -resource "null_resource" "deploy_dut1" { - depends_on = [ aws_instance.dut1 ] - connection { - user = "ubuntu" - host = aws_instance.dut1.public_ip - private_key = file("~/.ssh/id_rsa") - } - provisioner "ansible" { - plays { - playbook { - file_path = "../../testbed-setup/ansible/site_aws.yaml" - force_handlers = true - } - hosts = ["sut"] - extra_vars = { - ansible_python_interpreter = "/usr/bin/python3" - aws = true - } - } - } -} - -resource "null_resource" "deploy_topology" { - depends_on = [ aws_instance.tg, aws_instance.dut1 ] - provisioner "ansible" { - plays { - playbook { - file_path = "../../testbed-setup/ansible/cloud_topology.yaml" - } - hosts = ["local"] - extra_vars = { - ansible_python_interpreter = "/usr/bin/python3" - cloud_topology = "2n_aws_c5n" - 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 - } - } - } -} - -output "dbg_tg" { - value = "TG IP: ${aws_instance.tg.public_ip}" -} - -output "dbg_dut1" { - value = "DUT1 IP: ${aws_instance.dut1.public_ip}" -} - diff --git a/terraform-ci-infra/2n_aws_c5n/nic.tf b/terraform-ci-infra/2n_aws_c5n/nic.tf deleted file mode 100644 index b0a54e9b98..0000000000 --- a/terraform-ci-infra/2n_aws_c5n/nic.tf +++ /dev/null @@ -1,67 +0,0 @@ -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.CSIT.id] - attachment { - instance = aws_instance.dut1.id - device_index = 1 - } - depends_on = [aws_vpc.CSIT, aws_subnet.b] -} - -data "aws_network_interface" "dut1_if1" { - id = aws_network_interface.dut1_if1.id -} - -resource "aws_network_interface" "dut1_if2" { - subnet_id = aws_subnet.d.id - source_dest_check = false - private_ip = var.dut1_if2_ip - private_ips = [var.dut1_if2_ip] - security_groups = [aws_security_group.CSIT.id] - attachment { - instance = aws_instance.dut1.id - device_index = 2 - } - depends_on = [aws_vpc.CSIT] -} - -data "aws_network_interface" "dut1_if2" { - id = aws_network_interface.dut1_if2.id -} - -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.CSIT.id] - attachment { - instance = aws_instance.tg.id - device_index = 1 - } - depends_on = [aws_vpc.CSIT, aws_subnet.b] -} - -data "aws_network_interface" "tg_if1" { - id = aws_network_interface.tg_if1.id -} - -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.CSIT.id] - attachment { - instance = aws_instance.tg.id - device_index = 2 - } - depends_on = [aws_vpc.CSIT, aws_subnet.d] -} - -data "aws_network_interface" "tg_if2" { - id = aws_network_interface.tg_if2.id -} diff --git a/terraform-ci-infra/3n_aws_c5n/.gitignore b/terraform-ci-infra/3n_aws_c5n/.gitignore index fc64f0039f..40f77d862f 100644 --- a/terraform-ci-infra/3n_aws_c5n/.gitignore +++ b/terraform-ci-infra/3n_aws_c5n/.gitignore @@ -1,4 +1,5 @@ .terraform/ .terraform.tfstate.lock.info +.terraform.lock.hcl terraform.tfstate terraform.tfstate.backup diff --git a/terraform-ci-infra/3n_aws_c5n/deploy/main.tf b/terraform-ci-infra/3n_aws_c5n/deploy/main.tf new file mode 100644 index 0000000000..703be0c8c2 --- /dev/null +++ b/terraform-ci-infra/3n_aws_c5n/deploy/main.tf @@ -0,0 +1,482 @@ +provider "aws" { + region = var.region +} + +resource "aws_vpc" "CSITVPC" { + cidr_block = var.vpc_cidr_mgmt + + 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] + + ingress { + 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 + } + + egress { + 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 + } +} + +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] +} +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] +} +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] +} + +# 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] + + 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] + + 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] + + 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] + + tags = { + "Environment" = var.environment_name + } +} + +resource "aws_internet_gateway" "CSITGW" { + vpc_id = aws_vpc.CSITVPC.id + depends_on = [aws_vpc.CSITVPC] + + tags = { + "Environment" = var.environment_name + } +} + +# SSH keypair +# Temporary key for provisioning only +resource "tls_private_key" "CSITTLS" { + 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 +} + +resource "aws_placement_group" "CSITPG" { + 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] + + attachment { + instance = aws_instance.dut1.id + device_index = 1 + } + + 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] + + attachment { + instance = aws_instance.dut1.id + device_index = 2 + } + + 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] + + attachment { + instance = aws_instance.dut2.id + device_index = 1 + } + + 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] + + attachment { + instance = aws_instance.dut2.id + device_index = 2 + } + + 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] + + attachment { + instance = aws_instance.tg.id + device_index = 1 + } + + tags = { + "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] + + 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" { + ami = var.ami_image + availability_zone = var.avail_zone + instance_type = var.instance_type + key_name = aws_key_pair.CSITKP.key_name + associate_public_ip_address = true + subnet_id = aws_subnet.mgmt.id + private_ip = var.tg_mgmt_ip + vpc_security_group_ids = [aws_security_group.CSITSG.id] + placement_group = aws_placement_group.CSITPG.id + source_dest_check = false + depends_on = [aws_vpc.CSITVPC, aws_placement_group.CSITPG] + # 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" { + ami = var.ami_image + availability_zone = var.avail_zone + instance_type = var.instance_type + key_name = aws_key_pair.CSITKP.key_name + associate_public_ip_address = true + subnet_id = aws_subnet.mgmt.id + private_ip = var.dut1_mgmt_ip + vpc_security_group_ids = [aws_security_group.CSITSG.id] + placement_group = aws_placement_group.CSITPG.id + source_dest_check = false + depends_on = [aws_vpc.CSITVPC, aws_placement_group.CSITPG] + # 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" { + ami = var.ami_image + availability_zone = var.avail_zone + instance_type = var.instance_type + key_name = aws_key_pair.CSITKP.key_name + associate_public_ip_address = true + subnet_id = aws_subnet.mgmt.id + private_ip = var.dut2_mgmt_ip + vpc_security_group_ids = [aws_security_group.CSITSG.id] + placement_group = aws_placement_group.CSITPG.id + source_dest_check = false + depends_on = [aws_vpc.CSITVPC, aws_placement_group.CSITPG] + # 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" { + route_table_id = aws_vpc.CSITVPC.main_route_table_id + gateway_id = aws_internet_gateway.CSITGW.id + destination_cidr_block = "0.0.0.0/0" + depends_on = [aws_vpc.CSITVPC, aws_internet_gateway.CSITGW] +} +resource "aws_route" "dummy-trex-port-0" { + route_table_id = aws_vpc.CSITVPC.main_route_table_id + network_interface_id = aws_instance.tg.primary_network_interface_id + destination_cidr_block = var.trex_dummy_cidr_port_0 + depends_on = [aws_vpc.CSITVPC, aws_instance.dut1] +} +resource "aws_route" "dummy-trex-port-1" { + route_table_id = aws_vpc.CSITVPC.main_route_table_id + network_interface_id = aws_instance.tg.primary_network_interface_id + destination_cidr_block = var.trex_dummy_cidr_port_1 + depends_on = [aws_vpc.CSITVPC, aws_instance.dut1] +} + +# Deployment/Ansible +resource "null_resource" "deploy_tg" { + depends_on = [ + aws_instance.tg, + aws_network_interface.tg_if1, + aws_network_interface.tg_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 + } + } + } +} + +resource "null_resource" "deploy_dut1" { + depends_on = [ + 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 + } + } + } +} + +resource "null_resource" "deploy_dut2" { + depends_on = [ + 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 + } + } + } +} + +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/terraform-ci-infra/3n_aws_c5n/deploy/variables.tf b/terraform-ci-infra/3n_aws_c5n/deploy/variables.tf new file mode 100644 index 0000000000..f6fa83122f --- /dev/null +++ b/terraform-ci-infra/3n_aws_c5n/deploy/variables.tf @@ -0,0 +1,158 @@ +variable "region" { + description = "AWS Region" + type = string + default = "eu-central-1" +} + +variable "ami_image" { + description = "AWS AMI image name" + type = string + default = "ami-0b418580298265d5c" +} + +variable "testbed_name" { + description = "Testbed name" + type = string + default = "testbed1" +} + +variable "topology_name" { + description = "Prefix used when creating a topology file" + type = string + default = "3n_aws_c5n" +} + +variable "instance_type" { + description = "AWS instance type" + type = string + default = "c5n.4xlarge" +} + +variable "avail_zone" { + description = "AWS availability zone" + type = string + default = "eu-central-1a" +} + +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 = "../../resources/tools/testbed-setup/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 = "../../resources/tools/testbed-setup/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/terraform-ci-infra/3n_aws_c5n/deploy/versions.tf b/terraform-ci-infra/3n_aws_c5n/deploy/versions.tf new file mode 100644 index 0000000000..2d09eb67b4 --- /dev/null +++ b/terraform-ci-infra/3n_aws_c5n/deploy/versions.tf @@ -0,0 +1,17 @@ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 3.26.0" + } + null = { + source = "hashicorp/null" + version = "~> 3.0.0" + } + tls = { + source = "hashicorp/tls" + version = "~> 3.0.0" + } + } + required_version = ">= 0.13" +} diff --git a/terraform-ci-infra/3n_aws_c5n/main.tf b/terraform-ci-infra/3n_aws_c5n/main.tf index 9ba2b19abe..0e757b89bb 100644 --- a/terraform-ci-infra/3n_aws_c5n/main.tf +++ b/terraform-ci-infra/3n_aws_c5n/main.tf @@ -1,361 +1,56 @@ -provider "aws" { - region = "eu-central-1" -} - -variable "avail_zone" { - type = string - default = "eu-central-1a" -} -# Base VPC CIDRs -variable "vpc_cidr_mgmt" { - type = string - default = "192.168.0.0/24" -} -variable "vpc_cidr_b" { - type = string - default = "192.168.10.0/24" -} -variable "vpc_cidr_c" { - type = string - default = "200.0.0.0/24" -} -variable "vpc_cidr_d" { - type = string - default = "192.168.20.0/24" -} - -# Trex Dummy CIDRs -variable "trex_dummy_cidr_port_0" { - type = string - default = "10.0.0.0/24" -} -variable "trex_dummy_cidr_port_1" { - type = string - default = "20.0.0.0/24" -} - -# IPs -variable "tg_if1_ip" { - type = string - default = "192.168.10.254" -} -variable "tg_if2_ip" { - type = string - default = "192.168.20.254" -} -variable "dut1_if1_ip" { - type = string - default = "192.168.10.11" -} -variable "dut1_if2_ip" { - type = string - default = "200.0.0.101" -} -variable "dut2_if1_ip" { - type = string - default = "200.0.0.102" -} -variable "dut2_if2_ip" { - type = string - default = "192.168.20.11" -} -variable "tg_mgmt_ip" { - type = string - default = "192.168.0.10" -} -variable "dut1_mgmt_ip" { - type = string - default = "192.168.0.11" -} -variable "dut2_mgmt_ip" { - type = string - default = "192.168.0.12" -} - -# Instance Type -variable "instance_type" { - type = string - default = "c5n.9xlarge" -} - -resource "aws_vpc" "CSIT" { - cidr_block = var.vpc_cidr_mgmt -} - -resource "aws_security_group" "CSIT" { - name = "CSIT" - description = "Allow inbound traffic" - vpc_id = aws_vpc.CSIT.id - - ingress { - 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 - } - - egress { - from_port = 0 - to_port = 0 - protocol = "-1" - cidr_blocks = ["0.0.0.0/0"] - } - - depends_on = [aws_vpc.CSIT] -} - -resource "aws_vpc_ipv4_cidr_block_association" "b" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_b - depends_on = [aws_vpc.CSIT] -} -resource "aws_vpc_ipv4_cidr_block_association" "c" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_c - depends_on = [aws_vpc.CSIT] -} -resource "aws_vpc_ipv4_cidr_block_association" "d" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_d - depends_on = [aws_vpc.CSIT] -} - -resource "aws_subnet" "mgmt" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_mgmt - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSIT] -} - -resource "aws_subnet" "b" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_b - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSIT, aws_vpc_ipv4_cidr_block_association.b] -} - -resource "aws_subnet" "c" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_c - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSIT, aws_vpc_ipv4_cidr_block_association.c] -} - -resource "aws_subnet" "d" { - vpc_id = aws_vpc.CSIT.id - cidr_block = var.vpc_cidr_d - availability_zone = var.avail_zone - depends_on = [aws_vpc.CSIT, aws_vpc_ipv4_cidr_block_association.d] -} - -resource "aws_internet_gateway" "CSIT" { - vpc_id = aws_vpc.CSIT.id - depends_on = [aws_vpc.CSIT] -} - -resource "aws_key_pair" "CSIT" { - key_name = "CSIT" - public_key = file("~/.ssh/id_rsa.pub") -} - -data "aws_ami" "ubuntu" { - most_recent = true - - filter { - name = "name" - values = ["*hvm-ssd/ubuntu-bionic-18.04-amd64*"] - } - - filter { - name = "virtualization-type" - values = ["hvm"] - } - - owners = ["099720109477"] # Canonical -} - -resource "aws_placement_group" "CSIT" { - name = "CSIT" - strategy = "cluster" -} - -resource "aws_instance" "tg" { - ami = data.aws_ami.ubuntu.id - instance_type = var.instance_type -# cpu_threads_per_core = 1 -# cpu_core_count = 18 - key_name = aws_key_pair.CSIT.key_name - associate_public_ip_address = true - subnet_id = aws_subnet.mgmt.id - root_block_device { - volume_size = 50 - } - private_ip = var.tg_mgmt_ip - vpc_security_group_ids = [aws_security_group.CSIT.id] - depends_on = [aws_vpc.CSIT, aws_placement_group.CSIT] - placement_group = aws_placement_group.CSIT.id - source_dest_check = false -} - -resource "aws_instance" "dut1" { - ami = data.aws_ami.ubuntu.id -# cpu_threads_per_core = 1 -# cpu_core_count = 18 - instance_type = var.instance_type - key_name = aws_key_pair.CSIT.key_name - associate_public_ip_address = true - subnet_id = aws_subnet.mgmt.id - root_block_device { - volume_size = 50 - } - private_ip = var.dut1_mgmt_ip - vpc_security_group_ids = [aws_security_group.CSIT.id] - depends_on = [aws_vpc.CSIT, aws_placement_group.CSIT] - placement_group = aws_placement_group.CSIT.id - source_dest_check = false -} - -resource "aws_instance" "dut2" { - ami = data.aws_ami.ubuntu.id -# cpu_threads_per_core = 1 -# cpu_core_count = 18 - instance_type = var.instance_type - key_name = aws_key_pair.CSIT.key_name - associate_public_ip_address = true - subnet_id = aws_subnet.mgmt.id - root_block_device { - volume_size = 50 - } - private_ip = var.dut2_mgmt_ip - vpc_security_group_ids = [aws_security_group.CSIT.id] - depends_on = [aws_vpc.CSIT, aws_placement_group.CSIT] - placement_group = aws_placement_group.CSIT.id - source_dest_check = false -} - -resource "aws_route" "CSIT-igw" { - route_table_id = aws_vpc.CSIT.main_route_table_id - gateway_id = aws_internet_gateway.CSIT.id - destination_cidr_block = "0.0.0.0/0" - depends_on = [aws_vpc.CSIT, aws_internet_gateway.CSIT] -} -resource "aws_route" "dummy-trex-port-0" { - route_table_id = aws_vpc.CSIT.main_route_table_id - network_interface_id = aws_instance.tg.primary_network_interface_id - destination_cidr_block = var.trex_dummy_cidr_port_0 - depends_on = [aws_vpc.CSIT, aws_instance.dut1] -} -resource "aws_route" "dummy-trex-port-1" { - route_table_id = aws_vpc.CSIT.main_route_table_id - network_interface_id = aws_instance.tg.primary_network_interface_id - destination_cidr_block = var.trex_dummy_cidr_port_1 - depends_on = [aws_vpc.CSIT, aws_instance.dut2] -} - -resource "null_resource" "deploy_tg" { - depends_on = [ aws_instance.tg ] - connection { - user = "ubuntu" - host = aws_instance.tg.public_ip - private_key = file("~/.ssh/id_rsa") - } - provisioner "ansible" { - plays { - playbook { - file_path = "../../testbed-setup/ansible/site_aws.yaml" - force_handlers = true - } - hosts = ["tg"] - extra_vars = { - ansible_python_interpreter = "/usr/bin/python3" - aws = true - } - } - } -} -resource "null_resource" "deploy_dut1" { - depends_on = [ aws_instance.dut1 ] - connection { - user = "ubuntu" - host = aws_instance.dut1.public_ip - private_key = file("~/.ssh/id_rsa") - } - provisioner "ansible" { - plays { - playbook { - file_path = "../../testbed-setup/ansible/site_aws.yaml" - force_handlers = true - } - hosts = ["sut"] - extra_vars = { - ansible_python_interpreter = "/usr/bin/python3" - aws = true - } - } - } -} -resource "null_resource" "deploy_dut2" { - depends_on = [ aws_instance.dut2 ] - connection { - user = "ubuntu" - host = aws_instance.dut2.public_ip - private_key = file("~/.ssh/id_rsa") - } - provisioner "ansible" { - plays { - playbook { - file_path = "../../testbed-setup/ansible/site_aws.yaml" - force_handlers = true - } - hosts = ["sut"] - extra_vars = { - ansible_python_interpreter = "/usr/bin/python3" - aws = true - } - } - } -} - -resource "null_resource" "deploy_topology" { - depends_on = [ aws_instance.tg, aws_instance.dut1, aws_instance.dut2 ] - provisioner "ansible" { - plays { - playbook { - file_path = "../../testbed-setup/ansible/cloud_topology.yaml" - } - hosts = ["local"] - extra_vars = { - ansible_python_interpreter = "/usr/bin/python3" - cloud_topology = "3n_aws_c5n" - 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 - } - } - } -} - -output "dbg_tg" { - value = "TG IP: ${aws_instance.tg.public_ip}" -} - -output "dbg_dut1" { - value = "DUT1 IP: ${aws_instance.dut1.public_ip}" -} - -output "dbg_dut2" { - value = "DUT2 IP: ${aws_instance.dut2.public_ip}" +module "deploy" { + source = "./deploy" + + # TODO: Use ENV variable for testbed_name for dynamic deployment + testbed_name = "testbed1" + topology_name = "3n_aws_c5n" + environment_name = "CSIT-AWS" + resources_name_prefix = "CSIT_3n_aws_c5n" + + # AWS general + region = "eu-central-1" + avail_zone = "eu-central-1a" + instance_type = "c5n.4xlarge" + ami_image = "ami-0b418580298265d5c" + # eu-central-1/bionic-18.04-amd64-hvm-ssd-20200112 + # kernel 4.15.0-1057-aws (~4.15.0-74) + + # 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/24" + trex_dummy_cidr_port_1 = "20.0.0.0/24" + + # Ansible + ansible_python_executable = "/usr/bin/python3" + ansible_file_path = "../../resources/tools/testbed-setup/ansible/site.yaml" + ansible_topology_path = "../../resources/tools/testbed-setup/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/terraform-ci-infra/3n_aws_c5n/nic.tf b/terraform-ci-infra/3n_aws_c5n/nic.tf deleted file mode 100644 index 3efd74fc14..0000000000 --- a/terraform-ci-infra/3n_aws_c5n/nic.tf +++ /dev/null @@ -1,101 +0,0 @@ -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.CSIT.id] - attachment { - instance = aws_instance.dut1.id - device_index = 1 - } - depends_on = [aws_vpc.CSIT, aws_subnet.b] -} - -data "aws_network_interface" "dut1_if1" { - id = aws_network_interface.dut1_if1.id -} - -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.CSIT.id] - attachment { - instance = aws_instance.dut1.id - device_index = 2 - } - depends_on = [aws_vpc.CSIT] -} - -data "aws_network_interface" "dut1_if2" { - id = aws_network_interface.dut1_if2.id -} - -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.CSIT.id] - attachment { - instance = aws_instance.dut2.id - device_index = 1 - } - depends_on = [aws_vpc.CSIT, aws_subnet.c] -} - -data "aws_network_interface" "dut2_if1" { - id = aws_network_interface.dut2_if1.id -} - -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.CSIT.id] - attachment { - instance = aws_instance.dut2.id - device_index = 2 - } - depends_on = [aws_vpc.CSIT, aws_subnet.d] -} - -data "aws_network_interface" "dut2_if2" { - id = aws_network_interface.dut2_if2.id -} - -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.CSIT.id] - attachment { - instance = aws_instance.tg.id - device_index = 1 - } - depends_on = [aws_vpc.CSIT, aws_subnet.b] -} - -data "aws_network_interface" "tg_if1" { - id = aws_network_interface.tg_if1.id -} - -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.CSIT.id] - attachment { - instance = aws_instance.tg.id - device_index = 2 - } - depends_on = [aws_vpc.CSIT, aws_subnet.d] -} - -data "aws_network_interface" "tg_if2" { - id = aws_network_interface.tg_if2.id -} diff --git a/terraform-ci-infra/README.txt b/terraform-ci-infra/README.txt new file mode 100644 index 0000000000..c6b66d7232 --- /dev/null +++ b/terraform-ci-infra/README.txt @@ -0,0 +1,33 @@ +Terraform CI Infra +================== +This folder contains configuration for terraform based deployments. + + +Nomad: +---------------------- +Application orchestration - Nomad +- ./1n_nmd/ + + +AWS: +---------------------- +Testbed deployment - Amazon AWS +- ./2n_aws_c5n/ +- ./3n_aws_c5n/ + +Prerequisities: +~~~~~~~~~~~~~~~ +aws-cli >= 2.1.21 + - Configured with personal "AWS Access Key ID" and "AWS Secret Access Key" + - See: https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2-linux.html + +terraform >= v0.13 + - Terraform's Ansible provisioner requires manual installation + - see: https://github.com/radekg/terraform-provisioner-ansible + - Tested on v2.5.0 + + +Azure: +---------------------- +Testbed deployment - Microsoft Azure +- ./3n_azure_fsv2/ -- 2.16.6