diff options
Diffstat (limited to 'fdio.infra.ansible')
7 files changed, 88 insertions, 94 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml index 117c6d2c31..7c85cfd266 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml @@ -2,15 +2,7 @@ # file: host_vars/10.30.51.50.yaml hostname: "s1-t11-sut1" -grub: - hugepagesz: "2M" - hugepages: 32768 - iommu: "on" - vfio.enable_unsafe_noiommu_mode: 1 inventory_ipmi_hostname: "10.30.50.47" -cpu_microarchitecture: "skylake" - -intel_800_matrix: "dpdk22.03" # User management. users: @@ -38,7 +30,7 @@ nomad_certificates: nomad_datacenter: "yul1" nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}" nomad_node_role: "client" -nomad_node_class: "csit" +nomad_node_class: "hst" nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: false @@ -89,8 +81,6 @@ vault_version: "1.13.1" # Docker settings. docker_daemon: - default-shm-size: "1073741824" dns: ["172.17.0.1"] dns-opts: [] dns-search: ["{{ ansible_hostname }}"] - host: ["172.17.0.1:/var/run/docker.sock"] diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml index 875b759675..135b5ea049 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml @@ -2,15 +2,7 @@ # file: host_vars/10.30.51.51.yaml hostname: "s2-t12-sut1" -grub: - hugepagesz: "2M" - hugepages: 32768 - iommu: "on" - vfio.enable_unsafe_noiommu_mode: 1 inventory_ipmi_hostname: "10.30.50.48" -cpu_microarchitecture: "skylake" - -intel_800_matrix: "dpdk22.03" # User management. users: @@ -38,7 +30,7 @@ nomad_certificates: nomad_datacenter: "yul1" nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}" nomad_node_role: "client" -nomad_node_class: "csit" +nomad_node_class: "hst" nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: false @@ -89,8 +81,6 @@ vault_version: "1.13.1" # Docker settings. docker_daemon: - default-shm-size: "1073741824" dns: ["172.17.0.1"] dns-opts: [] dns-search: ["{{ ansible_hostname }}"] - host: ["172.17.0.1:/var/run/docker.sock"] diff --git a/fdio.infra.ansible/inventories/lf_inventory/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts index b7109a1261..420adc3a8d 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/hosts +++ b/fdio.infra.ansible/inventories/lf_inventory/hosts @@ -53,8 +53,6 @@ all: hosts: 10.30.51.30: #s30-t15-sut1 - sapphirerapids 10.30.51.31: #s31-t16-sut1 - sapphirerapids - 10.30.51.50: #s1-t11-sut1 - skylake - 10.30.51.51: #s2-t12-sut1 - skylake 10.30.51.70: #s55-t13-sut1 - thunderx2 9980 10.30.51.71: #s56-t14-sut1 - thunderx2 9980 nomad: @@ -67,8 +65,10 @@ all: 10.30.51.26: #s26-nomad - skylake 10.30.51.27: #s27-nomad - skylake 10.30.51.28: #s28-nomad - skylake + 10.30.51.50: #s1-t11-sut1 - skylake + 10.30.51.51: #s2-t12-sut1 - skylake 10.30.51.91: #s58-nomad - neoverse n1 10.30.51.92: #s59-nomad - neoverse n1 dev: hosts: - 10.30.51.38: #fdio-marvell-dev - thunderx 88xx
\ No newline at end of file + 10.30.51.38: #fdio-marvell-dev - thunderx 88xx 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..b33848e2d2 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" @@ -58,55 +46,78 @@ tags: - aws-load-kernel-modules -#- name: Get vfio-pci With WC Patcher -# ansible.builtin.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: 0744 -# tags: -# - aws-vfio-patch - -- name: Create vfio-pci Patch Directory - ansible.builtin.file: - path: "/opt/patches/" - state: "directory" +- name: Kernel Parameters + ansible.builtin.lineinfile: + path: "/etc/default/grub" + state: "present" + regexp: "^GRUB_CMDLINE_LINUX=" + line: "GRUB_CMDLINE_LINUX=iommu=1 intel_iommu=on" + notify: + - "Update GRUB" tags: - - aws-vfio-patch + - perf-conf-grub -- 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 +- meta: flush_handlers -- name: Copy vfio-pci WC Patch - ansible.builtin.copy: - src: "files/get-vfio-with-wc.sh" - dest: "/opt" - mode: 0744 +- name: Disable Password Login + ansible.builtin.lineinfile: + dest: "/etc/ssh/sshd_config" + regexp: "^PasswordAuthentication yes" + line: "PasswordAuthentication no" + notify: + - "Restart SSHd" tags: - - aws-vfio-patch + - conf-ssh -- name: Compile vfio-pci With WC Patch - ansible.builtin.shell: "/bin/bash /opt/get-vfio-with-wc.sh" - environment: - DEBIAN_FRONTEND: "noninteractive" - TERM: "vt100" +- name: Recursively Delete Other Configs + ansible.builtin.file: + path: "/etc/ssh/sshd_config.d" + state: "absent" tags: - - aws-vfio-patch + - conf-ssh -- name: Reload systemd-modules - ansible.builtin.systemd: - name: "systemd-modules-load" - state: "restarted" - tags: - - aws-reload-systemd-modules +#- name: Get vfio-pci With WC Patcher +# ansible.builtin.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: 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: 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" |