aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/testbed-setup/ansible/roles/calibration
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-03-16 07:41:07 +0000
committerPeter Mikus <pmikus@cisco.com>2019-03-16 07:41:07 +0000
commit648b88dded49db91bbdecf93fbc684e8c696752d (patch)
tree4c3084c20d4eb750ef39bb6e1ff3efd6ef1eced7 /resources/tools/testbed-setup/ansible/roles/calibration
parent5523f7ecbafd43f7c3d8a17c24bc70d83db39c0c (diff)
FIX: Ansible warnings of deprecation
[DEPRECATION WARNING]: Invoking "apt" only once while using a loop via squash_actions is deprecated. + aenum pip fix version + crypto dependencies Change-Id: I7ca4de48d68ec4d8a8f57fedf204fa6710a3e75f Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/calibration')
-rw-r--r--resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml5
-rw-r--r--resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml (renamed from resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml)2
2 files changed, 3 insertions, 4 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
index 17be80064a..ba9c46634f 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
@@ -1,9 +1,8 @@
---
# file: roles/calibration/tasks/main.yaml
-- name: Ubuntu specific
- import_tasks: ubuntu.yaml
- when: ansible_distribution|lower == 'ubuntu'
+- name: Install distribution - release - machine prerequisites
+ include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml'
- name: Run Spectre Meltdown checker
raw: 'spectre-meltdown-checker --no-color'
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml
index bb4ad1e8c7..ef453cdf9a 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml
@@ -1,5 +1,5 @@
---
-# file: roles/calibration/tasks/ubuntu.yaml
+# file: roles/calibration/tasks/ubuntu_bionic.yaml
- name: Install calibration dependencies
apt: