Fix: 17.03.2

This commit is contained in:
till 2019-01-07 08:39:25 +01:00
parent 416c0c9a06
commit 6e555e6b03
No known key found for this signature in database
GPG Key ID: B119050E2EBA1DC5
3 changed files with 19 additions and 0 deletions

View File

@ -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: []

View File

@ -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 }}"

View File

@ -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'