X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Ftg_sut%2Ftasks%2Fubuntu_bionic.yaml;h=6e8dee6cf1470dd2f5bfd67eb9e3856a44e3169b;hp=67c6c17220d4022e269c8cbc352eb34fbaad5b34;hb=891f932d2c0928038c7cb77f96ecad6e12c0e81f;hpb=27cff25483728d50e0215b895c680fb88f6ffe99

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 67c6c17220..6e8dee6cf1 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
@@ -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,7 +93,7 @@
 
 - name: Install kubernetes APT repository
   apt_repository:
-    repo: '{{ kubernetes_repository }}'
+    repo: '{{ kubernetes.repository }}'
     state: 'present'
     update_cache: True
   tags: install-kubernetes
@@ -101,9 +102,9 @@
   apt:
     name:
       - 'kubernetes-cni=0.6.0-00'
-      - 'kubeadm={{ kubernetes_apt_package_name }}'
-      - 'kubectl={{ kubernetes_apt_package_name }}'
-      - 'kubelet={{ kubernetes_apt_package_name }}'
+      - 'kubeadm={{ kubernetes.version }}'
+      - 'kubectl={{ kubernetes.version }}'
+      - 'kubelet={{ kubernetes.version }}'
     state: 'present'
     force: yes
   tags: install-kubernetes