blallo/ansible-role-docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make ignoring repository key error optional

Browse Source 
Just ignoring an error regarding the Docker GPG key and downloading it
from "some" web page is not desired in any environment.

Change-Id: I2d59e9bf070a4262ff5d251a65b698c858345eb7
This commit is contained in:
Dirk Weise 2018-02-22 10:55:56 +01:00
parent dd0c6e0f8e
commit 250660e149
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -12,6 +12,7 @@ docker_compose_path: /usr/local/bin/docker-compose
# Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed. # Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.
docker_apt_release_channel: stable docker_apt_release_channel: stable
docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
docker_apt_ignore_key_error: true
# Used only for RedHat/CentOS. # Used only for RedHat/CentOS.
docker_yum_repo_url: https://download.docker.com/linux/centos/docker-{{ docker_edition }}.repo docker_yum_repo_url: https://download.docker.com/linux/centos/docker-{{ docker_edition }}.repo

2
tasks/setup-Debian.yml
View File

@ -21,7 +21,7 @@
id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
state: present state: present
register: add_repository_key register: add_repository_key
ignore_errors: true ignore_errors: "{{ docker_apt_ignore_key_error }}"
- name: Ensure curl is present (on older systems without SNI). - name: Ensure curl is present (on older systems without SNI).
package: name=curl state=present package: name=curl state=present