X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Fdocker%2Ftasks%2Fubuntu_bionic.yaml;h=8bda4fed2130e0d99316fb852c039f3758caec2e;hp=32643b1119b69e89877cd836b945a84f4bcd0737;hb=7b93e96740997dab4383140a639b055e074f63c1;hpb=d3e0654a57aa958aaef1906e4a759e521655a86b

diff --git a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml
index 32643b1119..8bda4fed21 100644
--- a/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/docker/tasks/ubuntu_bionic.yaml
@@ -1,33 +1,30 @@
 ---
 # file: roles/docker/tasks/ubuntu_bionic.yaml
 
-- name: Docker repository - Dependencies
+- name: Inst - Dependencies
   apt:
     name:
-      - 'apt-transport-https'
-      - 'ca-certificates'
-      - 'software-properties-common'
-    state: 'present'
+      - "apt-transport-https"
+      - "ca-certificates"
+      - "gpg-agent"
+      - "software-properties-common"
+    state: "present"
     cache_valid_time: 3600
     install_recommends: False
-  tags: install-docker
+  tags:
+    - docker-inst-dependencies
 
-- name: Docker repository - Add an Apt signing key
+- name: Conf - Add APT Key
   apt_key:
-    url: 'https://download.docker.com/linux/ubuntu/gpg'
-    state: 'present'
-  tags: install-docker
+    url: "{{ docker_apt_gpg_key }}"
+    state: "{{ docker_apt_gpg_key_state }}"
+  tags:
+    - docker-conf-apt
 
-- name: Docker repository - Install APT repository
+- name: Conf - Install APT Repository
   apt_repository:
-    repo: '{{ docker_apt_repository }}'
-    state: '{{ docker_apt_repository_state }}'
-    update_cache: True
-  tags: install-docker
-
-- name: Install Docker
-  apt:
-    name: 'docker-{{ docker_edition }}={{ docker_apt_package }}'
-    state: '{{ docker_apt_package_state }}'
-    force: True
-  tags: install-docker
+    repo: "{{ docker_apt_repository }}"
+    state: "{{ docker_apt_repository_state }}"
+    update_cache: yes
+  tags:
+    - docker-conf-apt