diff options
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles')
4 files changed, 49 insertions, 28 deletions
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 |