diff options
| author |   pmikus <pmikus@cisco.com> | 2021-03-11 08:30:44 +0000 |
|---|---|---|
| committer | pmikus <pmikus@cisco.com> | 2021-03-11 08:30:44 +0000 |
| commit | 519119450555deecd40ee5d89e3d8a274c831b02 (patch) | |
| tree | 2c8b55e37d9a0d27bf5843f757f06b5763b8bb3b | |
| parent | c318223fcd266c0ee2982e803c44e193c2023054 (diff) | |
Infra: Minor ansible tweaks
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I47de0b78ed64b2426d39c5edf22ec36866609e8e
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile | 2 | ||||
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml | 32 |
2 files changed, 16 insertions, 18 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile index 6dddad6ebb..936de52c0f 100644 --- a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile +++ b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile @@ -84,8 +84,6 @@ RUN apt-get -q update \ sshpass \ && curl -L https://packagecloud.io/fdio/master/gpgkey | sudo apt-key add - \ && curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | sudo bash \ - # temp hack due to build.sh - && apt-get install -y -qq vpp-ext-deps \ && curl -fsSL https://get.docker.com | sh \ && rm -rf /var/lib/apt/lists/* diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml index feef2ca3a6..e9cdd0d819 100644 --- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml @@ -17,19 +17,6 @@ tags: - perf-inst-prerequisites -- name: Conf - Kernel Parameters - lineinfile: - path: "/etc/default/grub" - state: "present" - regexp: "^GRUB_CMDLINE_LINUX=" - line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value is sameas true %}{{key}} {% else %}{{key}}={{value}} {% endif %}{% endfor %}\"" - notify: - - "Update GRUB" - tags: - - perf-conf-grub - -- meta: flush_handlers - - name: Conf - Turbo Boost import_tasks: turbo_boost.yaml when: > @@ -164,8 +151,6 @@ owner: "root" group: "root" mode: 0644 - notify: - - "Update GRUB" tags: - perf-conf-irqbalance @@ -176,6 +161,19 @@ tags: - perf-conf-ondemand +- name: Conf - Kernel Parameters + lineinfile: + path: "/etc/default/grub" + state: "present" + regexp: "^GRUB_CMDLINE_LINUX=" + line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value is sameas true %}{{key}} {% else %}{{key}}={{value}} {% endif %}{% endfor %}\"" + notify: + - "Update GRUB" + tags: + - perf-conf-grub + +- meta: flush_handlers + - name: Conf - Load Kernel Modules By Default lineinfile: path: "/etc/modules" @@ -183,7 +181,9 @@ line: "{{ item }}" with_items: - "vfio-pci" + notify: + - "Reboot Server" tags: - perf-conf-load-kernel-modules -- meta: flush_handlers +- meta: flush_handlers
\ No newline at end of file |