diff options
| -rw-r--r-- | fdio.infra.ansible/roles/aws/defaults/main.yaml | 6 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/aws/handlers/main.yaml | 5 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/aws/tasks/main.yaml | 134 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml | 22 | ||||
| -rw-r--r-- | fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf | 4 | ||||
| -rw-r--r-- | fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl | 12 |
6 files changed, 98 insertions, 85 deletions
diff --git a/fdio.infra.ansible/roles/aws/defaults/main.yaml b/fdio.infra.ansible/roles/aws/defaults/main.yaml index 5b6978da51..a0150eae37 100644 --- a/fdio.infra.ansible/roles/aws/defaults/main.yaml +++ b/fdio.infra.ansible/roles/aws/defaults/main.yaml @@ -15,12 +15,10 @@ packages_base: packages_by_distro: ubuntu: - - "linux-image-5.4.0-1009-aws" - - "linux-headers-5.4.0-1009-aws" - - "linux-tools-5.4.0-1009-aws" + - [] packages_by_arch: aarch64: - [] x86_64: - - []
\ No newline at end of file + - [] diff --git a/fdio.infra.ansible/roles/aws/handlers/main.yaml b/fdio.infra.ansible/roles/aws/handlers/main.yaml index d55db1c22f..bc160a3263 100644 --- a/fdio.infra.ansible/roles/aws/handlers/main.yaml +++ b/fdio.infra.ansible/roles/aws/handlers/main.yaml @@ -18,3 +18,8 @@ reboot_timeout: 3600 tags: - reboot-server + +- name: Restart SSHd + ansible.builtin.service: + name: sshd + state: restarted diff --git a/fdio.infra.ansible/roles/aws/tasks/main.yaml b/fdio.infra.ansible/roles/aws/tasks/main.yaml index b5132c1909..f9e84ae97a 100644 --- a/fdio.infra.ansible/roles/aws/tasks/main.yaml +++ b/fdio.infra.ansible/roles/aws/tasks/main.yaml @@ -13,18 +13,6 @@ tags: - aws-inst-prerequisites -- name: Switch Kernel At Boot - ansible.builtin.lineinfile: - path: "/etc/default/grub" - state: "present" - line: "GRUB_DEFAULT=\"1>2\"" - notify: - - "Update GRUB" - tags: - - perf-conf-grub - -- meta: flush_handlers - - name: Load Kernel Modules By Default ansible.builtin.lineinfile: path: "/etc/modules" @@ -32,7 +20,6 @@ line: "{{ item }}" with_items: - "igb_uio" - - "vfio-pci" tags: - aws-load-kernel-modules @@ -47,16 +34,46 @@ tags: - aws-load-kernel-modules -- name: Add Kernel Modules Options (vfio-pci) +- name: Kernel Parameters ansible.builtin.lineinfile: - path: "/etc/modprobe.d/vfio-noiommu.conf" + path: "/etc/default/grub" state: "present" - line: "{{ item }}" - create: "yes" - with_items: - - "options vfio enable_unsafe_noiommu_mode=1" + regexp: "^GRUB_CMDLINE_LINUX=" + line: "GRUB_CMDLINE_LINUX=iommu=1 intel_iommu=on" + notify: + - "Update GRUB" tags: - - aws-load-kernel-modules + - perf-conf-grub + +- meta: flush_handlers + +- name: Disable Password Login + ansible.builtin.lineinfile: + dest: "/etc/ssh/sshd_config" + regexp: "^PasswordAuthentication yes" + line: "PasswordAuthentication no" + notify: + - "Restart SSHd" + tags: + - conf-ssh + +- name: Recursively other configs + ansible.builtin.file: + path: "/etc/ssh/sshd_config.d" + state: "absent" + tags: + - conf-ssh + +#- name: Add Kernel Modules Options (vfio-pci) +# ansible.builtin.lineinfile: +# path: "/etc/modprobe.d/vfio-noiommu.conf" +# state: "present" +# line: "{{ item }}" +# create: "yes" +# with_items: +# - "options vfio enable_unsafe_noiommu_mode=1" +# tags: +# - aws-load-kernel-modules #- name: Get vfio-pci With WC Patcher # ansible.builtin.get_url: @@ -65,48 +82,41 @@ # mode: 0744 # tags: # - aws-vfio-patch - -- name: Create vfio-pci Patch Directory - ansible.builtin.file: - path: "/opt/patches/" - state: "directory" - tags: - - aws-vfio-patch - -- name: Get vfio-pci WC Patch - ansible.builtin.get_url: - url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/patches/{{ item }}" - dest: "/opt/patches/{{ item }}" - mode: 0744 - with_items: - - "linux-4.10-vfio-wc.patch" - - "linux-5.8-vfio-wc.patch" - - "linux-5.15-vfio-wc.patch" - tags: - - aws-vfio-patch - -- name: Copy vfio-pci WC Patch - ansible.builtin.copy: - src: "files/get-vfio-with-wc.sh" - dest: "/opt" - mode: 0744 - tags: - - aws-vfio-patch - -- name: Compile vfio-pci With WC Patch - ansible.builtin.shell: "/bin/bash /opt/get-vfio-with-wc.sh" - environment: - DEBIAN_FRONTEND: "noninteractive" - TERM: "vt100" - tags: - - aws-vfio-patch - -- name: Reload systemd-modules - ansible.builtin.systemd: - name: "systemd-modules-load" - state: "restarted" - tags: - - aws-reload-systemd-modules +# +#- name: Create vfio-pci Patch Directory +# ansible.builtin.file: +# path: "/opt/patches/" +# state: "directory" +# tags: +# - aws-vfio-patch +# +#- name: Get vfio-pci WC Patch +# ansible.builtin.get_url: +# url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/patches/{{ item }}" +# dest: "/opt/patches/{{ item }}" +# mode: 0744 +# with_items: +# - "linux-4.10-vfio-wc.patch" +# - "linux-5.8-vfio-wc.patch" +# - "linux-5.15-vfio-wc.patch" +# tags: +# - aws-vfio-patch +# +#- name: Copy vfio-pci WC Patch +# ansible.builtin.copy: +# src: "files/get-vfio-with-wc.sh" +# dest: "/opt" +# mode: 0744 +# tags: +# - aws-vfio-patch +# +#- name: Compile vfio-pci With WC Patch +# ansible.builtin.shell: "/bin/bash /opt/get-vfio-with-wc.sh" +# environment: +# DEBIAN_FRONTEND: "noninteractive" +# TERM: "vt100" +# tags: +# - aws-vfio-patch - name: Adjust nr_hugepages ansible.builtin.sysctl: diff --git a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml index 1a747f68d5..959330508d 100644 --- a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml +++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml @@ -46,17 +46,17 @@ retries: 300 when: trex_extracted.changed -- name: Compile Release {{ item }} Part III - ansible.builtin.command: "make -j 16" - args: - chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src" - when: trex_extracted.changed - -- name: Compile Release {{ item }} Part IV - ansible.builtin.command: "make install" - args: - chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src" - when: trex_extracted.changed +#- name: Compile Release {{ item }} Part III +# ansible.builtin.command: "make -j 16" +# args: +# chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src" +# when: trex_extracted.changed + +#- name: Compile Release {{ item }} Part IV +# ansible.builtin.command: "make install" +# args: +# chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src" +# when: trex_extracted.changed - name: Link libc.a to liblibc.a ansible.builtin.command: "ln -s -f /usr/lib/x86_64-linux-gnu/libc.a /usr/lib/x86_64-linux-gnu/liblibc.a" diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf index 51af9587d9..dc08d10668 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf @@ -50,7 +50,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-07430bfa17fd4e597" + default = "ami-05832aa8871fda2ef" } variable "tg_associate_public_ip_address" { @@ -86,7 +86,7 @@ variable "tg_source_dest_check" { variable "sut1_ami" { description = "AMI to use for the instance." type = string - default = "ami-0a890555652963ec2" + default = "ami-0d4f2b5ee26aedefe" } variable "sut1_associate_public_ip_address" { diff --git a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl index 7293d176e0..625a3a1ea7 100644 --- a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl +++ b/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl @@ -51,7 +51,7 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_sut" { ami_name = "csit_ubuntu_jammy_x86_sut" ami_description = "CSIT SUT image based on Ubuntu Jammy" ena_support = true - instance_type = "c5n.4xlarge" + instance_type = "c6in.4xlarge" launch_block_device_mappings { device_name = "/dev/sda1" volume_size = 40 @@ -60,7 +60,7 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_sut" { force_deregister = true region = "eu-central-1" skip_create_ami = false - source_ami = "ami-04e601abe3e1a910f" + source_ami = "ami-026c3177c9bd54288" ssh_username = "ubuntu" } @@ -68,7 +68,7 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_tg" { ami_name = "csit_ubuntu_jammy_x86_tg" ami_description = "CSIT TG image based on Ubuntu Jammy" ena_support = true - instance_type = "c5n.4xlarge" + instance_type = "c6in.4xlarge" launch_block_device_mappings { device_name = "/dev/sda1" volume_size = 40 @@ -77,7 +77,7 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_tg" { force_deregister = true region = "eu-central-1" skip_create_ami = false - source_ami = "ami-04e601abe3e1a910f" + source_ami = "ami-026c3177c9bd54288" ssh_username = "ubuntu" } @@ -92,10 +92,10 @@ build { provisioner "ansible" { playbook_file = var.ansible_file_path user = "ubuntu" + use_proxy = false groups = ["sut_aws"] extra_arguments = [ "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", - "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}", "--extra-vars", "aws=true" ] } @@ -115,10 +115,10 @@ build { provisioner "ansible" { playbook_file = var.ansible_file_path user = "ubuntu" + use_proxy = false groups = ["tg_aws"] extra_arguments = [ "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", - "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}", "--extra-vars", "aws=true" ] } |