aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/testbed-setup/ansible/roles/tg/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/tg/tasks')
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu.yaml11
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml9
3 files changed, 13 insertions, 11 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
index 54001a7272..9fa19b5b0f 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml
@@ -2,5 +2,5 @@
# file: roles/tg/tasks/main.yaml
- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+ import_tasks: ubuntu.yaml
+ when: ansible_distribution|lower == 'ubuntu'
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu.yaml
new file mode 100644
index 0000000000..acb4f9802e
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu.yaml
@@ -0,0 +1,11 @@
+---
+# file: roles/tg/tasks/ubuntu.yaml
+
+- name: Install CSIT dependencies
+ apt:
+ name: '{{ item }}'
+ state: 'present'
+ install_recommends: False
+ with_items:
+ - 'unzip'
+ tags: install-csit-dependencies
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml
deleted file mode 100644
index 54a04685e6..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# file: roles/tg/tasks/ubuntu_x86_64.yaml
-
-- name: Install Unzip
- apt:
- name: 'unzip'
- state: 'present'
- update_cache: True
- tags: install-unzip