aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/testbed-setup/ansible/roles
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-09-10 11:27:11 +0000
committerPeter Mikus <pmikus@cisco.com>2019-09-11 13:07:15 +0000
commitb82474874d4329d3e82ea8a22754b7b04cf969ee (patch)
tree684a3a5ccf06639139221f15423aed4f633a5579 /resources/tools/testbed-setup/ansible/roles
parent2fe2a2c140bffa10678e3e217c8a5cba0fd4dbd0 (diff)
Ansible: Cascadelake include
Signed-off-by: Peter Mikus <pmikus@cisco.com> Change-Id: Iecb18e9d94ff715e40152564fb778650d43a48d3
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles')
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml6
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/turbo_boost.yaml (renamed from resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml)6
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml2
3 files changed, 7 insertions, 7 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
index 7f74beec51..a2d2c2061a 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
@@ -9,9 +9,9 @@
include_tasks: '{{ ansible_machine }}.yaml'
tags: [ disable-turbo-boost, set-grub, install-pip ]
-- name: Skylake specific
- import_tasks: skylake.yaml
- when: cpu_microarchitecture == "skylake"
+- name: Turbo boost specific
+ import_tasks: turbo_boost.yaml
+ when: cpu_microarchitecture == "skylake" or cpu_microarchitecture == "cascadelake"
tags: [ install-msr, disable-turbo-boost ]
- name: Copy netplan network config file
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/turbo_boost.yaml
index 33e061e724..1002792aa8 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/turbo_boost.yaml
@@ -1,5 +1,5 @@
---
-# file: roles/tg_sut/tasks/skylake.yaml
+# file: roles/tg_sut/tasks/turbo_boost.yaml
- name: Install msr-tools
apt:
@@ -9,7 +9,7 @@
install_recommends: False
tags: install-msr
-- name: Disable Skylake Turbo-Boost by service
+- name: Disable Turbo-Boost by service
copy:
src: 'files/disable-turbo-boost.service'
dest: '/etc/systemd/system/disable-turbo-boost.service'
@@ -18,7 +18,7 @@
mode: '0644'
tags: disable-turbo-boost
-- name: Disable Skylake Turbo-Boost by service on startup
+- name: Disable Turbo-Boost by service on startup
service:
name: disable-turbo-boost
enabled: yes
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml
index 6e8dee6cf1..a8c2266201 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml
@@ -5,7 +5,7 @@
apt:
name:
- 'python-dev'
- - 'python-virtualenv'
+ - 'virtualenv'
- 'python-pip'
- 'libpcap-dev'
- 'cpufrequtils'