From 3b1f5de0b495d72b7edca686db7dbb4403c9b04a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 4 Jan 2019 00:21:24 +0100 Subject: make docker role more generic --- roles/docker/tasks/main.yml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'roles/docker/tasks/main.yml') diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 2253f1ed..017e2786 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -21,30 +21,18 @@ fstype: "{{ docker_lvm.fs }}" state: mounted -- name: install apt https transport - apt: - name: apt-transport-https - state: present - -- name: add docker apt key - apt_key: - data: "{{ lookup('file', 'docker-apt-key.asc') }}" - state: present - -- name: add docker apt repo - apt_repository: - repo: "deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable" - state: present - filename: docker +- name: prepare package provider + when: docker_pkg_provider != 'distro' + include_tasks: "{{ docker_pkg_provider }}.yml" - name: install docker apt: - name: "docker-ce{% if docker_pkg_version is defined %}={{ docker_pkg_version }}{% endif %}" + name: "{{ docker_pkg_name }}{% if docker_pkg_version is defined %}={{ docker_pkg_version }}{% endif %}" state: present force: yes - name: disable automatic upgrades for docker package when: docker_pkg_version is defined dpkg_selections: - name: docker-ce + name: "{{ docker_pkg_name }}" selection: hold -- cgit v1.2.3