From 6e555e6b03358eaa8b7563a0090162f9d941604f Mon Sep 17 00:00:00 2001 From: till Date: Mon, 7 Jan 2019 08:39:25 +0100 Subject: [PATCH] Fix: 17.03.2 --- defaults/main.yml | 2 ++ tasks/main.yml | 10 ++++++++++ tasks/setup-RedHat.yml | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 3a9cc47..e1c78bd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,6 +3,7 @@ docker_edition: 'ce' docker_package: "docker-{{ docker_edition }}" docker_package_state: present +docker_package_version: nil # Service options. docker_service_state: started @@ -24,6 +25,7 @@ docker_apt_ignore_key_error: true docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo docker_yum_repo_enable_edge: 0 docker_yum_repo_enable_test: 0 +docker_yum_config: /etc/yum-docker.conf # A list of users who will be added to the docker group. docker_users: [] diff --git a/tasks/main.yml b/tasks/main.yml index 8968c77..1fac4ef 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -5,7 +5,17 @@ - include_tasks: setup-Debian.yml when: ansible_os_family == 'Debian' +- name: Install Docker on CentOS/Redhat + when: ansible_os_family == 'RedHat' + yum: + name: + - "docker-ce-selinux-{{ docker_package_version }}" + - "{{ docker_package }}-{{ docker_package_version }}" + conf_file: "{{ docker_yum_config }}" + state: "{{ docker_package_state }}" + - name: Install Docker. + when: ansible_os_family == 'Debian' package: name: "{{ docker_package }}" state: "{{ docker_package_state }}" diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 0cd1a50..171e530 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -33,3 +33,10 @@ section: 'docker-{{ docker_edition }}-test' option: enabled value: '{{ docker_yum_repo_enable_test }}' + +- name: Setup yum-docker.conf + ini_file: + dest: "{{ docker_yum_config }}" + section: 'main' + option: obsoletes + value: '0'