FIX: Small ansible fixes

[csit.git] / resources / tools / testbed-setup / ansible / roles / sut / tasks / ubuntu_bionic.yaml

diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml
index 962c333..ec2e6fc 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_bionic.yaml
@@ -4,43 +4,23 @@
 - name: Install CSIT dependencies
   apt:
     name:
-      - 'dkms'
-      - 'pkg-config'
+      - 'gdb'
       - 'libglib2.0-dev'
-      - 'autoconf'
-      - 'libtool'
-      - 'screen'
       - 'libmbedcrypto1'
       - 'libmbedtls10'
       - 'libmbedx509-0'
+      - 'libnuma-dev'
+      - 'libpixman-1-dev'
+      - 'libtool'
       - 'lxc'
       - 'openjdk-8-jdk'
-      - 'libpixman-1-dev'
-      - 'python-cffi'
-      - 'python-cffi-backend'
-      - 'python3-cffi'
-      - 'python3-cffi-backend'
-      - 'libnuma-dev'
-      - 'lzop'
-      - 'lrzip'
+      - 'pkg-config'
+      - 'screen'
     state: 'present'
+    cache_valid_time: 3600
     install_recommends: False
   tags: install-csit-dependencies
 
-- name: Get kernel-kvm version
-  shell: "apt-cache depends -i linux-image-kvm | grep Depends: | cut -d' ' -f4"
-  register: 'linux__image_kvm_read'
-  tags: install-kernelvm
-
-- name: Download kernel-kvm
-  shell: "apt-get -y download {{ linux__image_kvm_read.stdout }}"
-  args:
-    warn: false # Prevent warning as APT module does not support download.
-  register: 'linux__image_kvm_download'
-  when: 'linux__image_kvm_read'
-  tags: install-kernelvm
-
-- name: Unpack kernel-kvm
-  shell: "dpkg --extract {{ linux__image_kvm_read.stdout }}_*.deb /opt/"
-  when: 'linux__image_kvm_download'
-  tags: install-kernelvm
+- name: Kernel VM install
+  include_tasks: '../../common/tasks/kernel_install.yaml'
+  tags: install-kernel-image