From b82474874d4329d3e82ea8a22754b7b04cf969ee Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Tue, 10 Sep 2019 11:27:11 +0000
Subject: Ansible: Cascadelake include

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Iecb18e9d94ff715e40152564fb778650d43a48d3
---
 .../ansible/roles/tg_sut/tasks/main.yaml           |  6 +++---
 .../ansible/roles/tg_sut/tasks/skylake.yaml        | 25 ----------------------
 .../ansible/roles/tg_sut/tasks/turbo_boost.yaml    | 25 ++++++++++++++++++++++
 .../ansible/roles/tg_sut/tasks/ubuntu_bionic.yaml  |  2 +-
 4 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml
 create mode 100644 resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/turbo_boost.yaml

(limited to 'resources/tools/testbed-setup/ansible/roles')

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/skylake.yaml
deleted file mode 100644
index 33e061e724..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-# file: roles/tg_sut/tasks/skylake.yaml
-
-- name: Install msr-tools
-  apt:
-    name:
-      - 'msr-tools'
-    state: 'present'
-    install_recommends: False
-  tags: install-msr
-
-- name: Disable Skylake Turbo-Boost by service
-  copy:
-    src: 'files/disable-turbo-boost.service'
-    dest: '/etc/systemd/system/disable-turbo-boost.service'
-    owner: 'root'
-    group: 'root'
-    mode: '0644'
-  tags: disable-turbo-boost
-
-- name: Disable Skylake Turbo-Boost by service on startup
-  service:
-    name: disable-turbo-boost
-    enabled: yes
-  tags: disable-turbo-boost
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/turbo_boost.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/turbo_boost.yaml
new file mode 100644
index 0000000000..1002792aa8
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/turbo_boost.yaml
@@ -0,0 +1,25 @@
+---
+# file: roles/tg_sut/tasks/turbo_boost.yaml
+
+- name: Install msr-tools
+  apt:
+    name:
+      - 'msr-tools'
+    state: 'present'
+    install_recommends: False
+  tags: install-msr
+
+- name: Disable Turbo-Boost by service
+  copy:
+    src: 'files/disable-turbo-boost.service'
+    dest: '/etc/systemd/system/disable-turbo-boost.service'
+    owner: 'root'
+    group: 'root'
+    mode: '0644'
+  tags: disable-turbo-boost
+
+- name: Disable Turbo-Boost by service on startup
+  service:
+    name: disable-turbo-boost
+    enabled: yes
+  tags: disable-turbo-boost
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'
-- 
cgit 1.2.3-korg