Ansible: Cascadelake include

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

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 1946097..a8c2266 100644 (file)
--- 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
@@ -3,22 +3,22 @@
 
 - name: Install CSIT dependencies
   apt:
-    name: '{{ item }}'
+    name:
+      - 'python-dev'
+      - 'virtualenv'
+      - 'python-pip'
+      - 'libpcap-dev'
+      - 'cpufrequtils'
+      - 'cgroup-bin'
+      - 'zlib1g-dev'
+      - 'apt-transport-https'
+      - 'ca-certificates'
+      - 'software-properties-common'
+      - 'libnuma-dev'
+      - 'lzop'
+      - 'lrzip'
     state: 'present'
     install_recommends: False
-  with_items:
-    - 'python-dev'
-    - 'python-virtualenv'
-    - 'python-pip'
-    - 'libpcap-dev'
-    - 'cpufrequtils'
-    - 'cgroup-bin'
-    - 'zlib1g-dev'
-    - 'apt-transport-https'
-    - 'ca-certificates'
-    - 'software-properties-common'
-    - 'cron'
-    - 'libnuma-dev'
   tags: install-csit-dependencies
 
 - name: Add an Apt signing key, for docker-ce repository
@@ -45,6 +45,7 @@
   file:
     path: '/etc/systemd/system/docker.service.d'
     state: 'directory'
+  tags: install-docker
 
 - name: Setup Docker http proxy
   template:
@@ -55,7 +56,7 @@
     mode: '0644'
   register: docker_register_systemd_service
   when: proxy_env is defined and proxy_env.http_proxy is defined
-  tags: copy-docker
+  tags: install-docker
 
 - name: Setup Docker https proxy
   template:
@@ -66,14 +67,14 @@
     mode: '0644'
   register: docker_register_systemd_service
   when: proxy_env is defined and proxy_env.https_proxy is defined
-  tags: copy-docker
+  tags: install-docker
 
 - name: Reload systemd daemon
   command: 'systemctl daemon-reload'
   notify: ['Restart Docker']
   when: (docker_register_systemd_service and
          docker_register_systemd_service is changed)
-  tags: restart-docker
+  tags: install-docker
 
 - name: Set specific users to docker group
   user:
@@ -82,7 +83,7 @@
     append: True
   with_items: '{{ docker_users }}'
   when: docker_users
-  tags: set-docker
+  tags: install-docker
 
 - name: Add an Apt signing key, for Kubernetes repository
   apt_key:
@@ -92,20 +93,20 @@
 
 - name: Install kubernetes APT repository
   apt_repository:
-    repo: '{{ kubernetes_repository }}'
+    repo: '{{ kubernetes.repository }}'
     state: 'present'
     update_cache: True
   tags: install-kubernetes
 
 - name: Install Kubernetes
   apt:
-    name: '{{ item }}={{ kubernetes_apt_package_name }}'
+    name:
+      - 'kubernetes-cni=0.6.0-00'
+      - 'kubeadm={{ kubernetes.version }}'
+      - 'kubectl={{ kubernetes.version }}'
+      - 'kubelet={{ kubernetes.version }}'
     state: 'present'
     force: yes
-  with_items:
-    - 'kubeadm'
-    - 'kubectl'
-    - 'kubelet'
   tags: install-kubernetes
 
 - name: Apply kubelet parameter