summaryrefslogtreecommitdiffstats
path: root/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml
diff options
context:
space:
mode:
authorMichal Ptacek <m.ptacek@partner.samsung.com>2019-05-02 15:09:26 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-02 15:09:26 +0000
commit517e4576afcdd6b59a3b552ea394901c2003ca0a (patch)
tree66f615ea3c8962cfd2f8dba2ae578fc3089b8ed6 /ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml
parent3dc563b8f1d42daf3e6455b40b63525c37001bad (diff)
parenta222de90c7485960f9a7836543fd4bba28bad6f8 (diff)
Merge "Make 'prepare-docker' install proper docker-ce version"
Diffstat (limited to 'ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml')
-rw-r--r--ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml12
1 files changed, 10 insertions, 2 deletions
diff --git a/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml b/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml
index 26f89d64..f35ffeee 100644
--- a/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml
+++ b/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml
@@ -7,8 +7,16 @@
gpgcheck: true
gpgkey: https://download.docker.com/linux/centos/gpg
-- name: Install docker python bindings
- import_tasks: python-bindings.yml
+- name: Create rpm dir
+ file:
+ path: "{{ rpm_dir }}"
+ state: directory
+
+- name: Handle python2-docker dependency needed by Ansible's docker_* modules
+ import_tasks: python2-docker.yml
+
+- name: Handle docker-ce packages
+ import_tasks: docker-packages.yml
- name: Fake dockerd on container
import_tasks: docker-socket-override.yml