From 4fd6349133f5ffbd96795dedd4549ef0612c9ab5 Mon Sep 17 00:00:00 2001 From: Jan Benedikt Date: Tue, 17 Mar 2020 11:39:38 +0100 Subject: Adding Ubuntu support in Ansible - docker-dind role Extending ansible playbooks of ubuntu support. Issue-ID: OOM-1671 Signed-off-by: Jan Benedikt Change-Id: I6028736b54ce825d3eae257ca61cb6efab19a913 --- .../test/roles/prepare-docker-dind/tasks/main.yml | 26 ++++------------------ 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'ansible/test/roles/prepare-docker-dind/tasks/main.yml') diff --git a/ansible/test/roles/prepare-docker-dind/tasks/main.yml b/ansible/test/roles/prepare-docker-dind/tasks/main.yml index c0bf1543..50efe143 100644 --- a/ansible/test/roles/prepare-docker-dind/tasks/main.yml +++ b/ansible/test/roles/prepare-docker-dind/tasks/main.yml @@ -1,24 +1,6 @@ --- -# Needed because host system has all mounts by default to shared, and -# some things may depend on mounts being shared if we run docker inside -# test env. -- name: "Make all mounts shared" - command: "mount --make-rshared /" - args: - warn: false +- include: rhel.yml + when: ansible_distribution in ["CentOS","Red Hat Enterprise Linux"] -- name: "Enable docker repository" - yum_repository: - name: "Docker" - description: Docker-ce repository - enabled: yes - baseurl: "https://download.docker.com/linux/centos/7/$basearch/stable" - gpgcheck: yes - gpgkey: https://download.docker.com/linux/centos/gpg - -- name: "Install docker" - package: - name: "docker-ce-{{ docker_version }}" - state: present - allow_downgrade: true - notify: Restart docker +- include: ubuntu.yml + when: ansible_distribution in ["Ubuntu","Debian"] \ No newline at end of file -- cgit 1.2.3-korg