aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/testbed-setup/ansible/roles/performance_tuning
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2020-02-17 08:42:16 +0000
committerPeter Mikus <pmikus@cisco.com>2020-02-17 08:47:47 +0000
commitc8c28c8589091e8a65d3c60e17dfeb6e4c99c302 (patch)
tree10ace5ce20f2a7fc140152b0435f639e23c4dba2 /resources/tools/testbed-setup/ansible/roles/performance_tuning
parente8db3444e0025cb1d34952f4064ae391f94dd327 (diff)
Fix: Ansible minor bugs
Signed-off-by: Peter Mikus <pmikus@cisco.com> Change-Id: I804e78c3b8586dc9e9ca8b7cf4bf97d3744aeedc
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/performance_tuning')
-rw-r--r--resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/roles/performance_tuning/handlers/main.yaml10
-rw-r--r--resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml2
3 files changed, 8 insertions, 8 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
index 60c16a9915..edec57aba0 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
@@ -18,6 +18,6 @@ packages_by_arch:
grub_cmdline_linux:
aarch64:
- - 'GRUB_CMDLINE_LINUX="isolcpus={{ grub.isolcpus }} nohz_full={{ grub.nohz_full }} rcu_nocbs={{ grub.rcu_nocbs }} intel_iommu=on nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1"'
+ - "GRUB_CMDLINE_LINUX=\"isolcpus={{ grub.isolcpus }} nohz_full={{ grub.nohz_full }} rcu_nocbs={{ grub.rcu_nocbs }} intel_iommu=on nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1\""
x86_64:
- - 'GRUB_CMDLINE_LINUX="isolcpus={{ grub.isolcpus }} nohz_full={{ grub.nohz_full }} rcu_nocbs={{ grub.rcu_nocbs }} numa_balancing=disable intel_pstate=disable intel_iommu=on iommu=pt nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 intel_idle.max_cstate=1 hpet=disable tsc=reliable mce=off"'
+ - "GRUB_CMDLINE_LINUX=\"isolcpus={{ grub.isolcpus }} nohz_full={{ grub.nohz_full }} rcu_nocbs={{ grub.rcu_nocbs }} numa_balancing=disable intel_pstate=disable intel_iommu=on iommu=pt nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 intel_idle.max_cstate=1 hpet=disable tsc=reliable mce=off\""
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/handlers/main.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/handlers/main.yaml
index 917856b7a0..fa2876b7ac 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/handlers/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/handlers/main.yaml
@@ -1,13 +1,13 @@
---
# file roles/performance_tuning/handlers/main.yaml
+- name: Update GRUB
+ command: update-grub
+ tags:
+ - update-grub
+
- name: Reboot server
reboot:
reboot_timeout: 3600
tags:
- reboot-server
-
-- name: Update GRUB
- command: update-grub
- tags:
- - update-grub
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 9fedd27160..e28f9ba6a2 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
@@ -14,7 +14,7 @@
path: "/etc/default/grub"
state: "present"
regexp: "^GRUB_CMDLINE_LINUX="
- line: "{{ grub_cmdline_linux[ansible_machine] }}"
+ line: "{{ grub_cmdline_linux[ansible_machine] | join() }}"
notify:
- "Update GRUB"
- "Reboot server"