Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2025-09-26 17:51:03 +02:00
Code Issues Projects Releases Wiki Activity

remove tags, the docker_add_repo variable is a better mechanism for this

Browse Source
This commit is contained in:
Adam DeConinck 2019-05-16 14:18:36 -07:00
parent 6004a511d2
commit 06cdd3096d
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasks/setup-Debian.yml
View File

@ -20,8 +20,6 @@
state: present state: present
register: add_repository_key register: add_repository_key
ignore_errors: "{{ docker_apt_ignore_key_error }}" ignore_errors: "{{ docker_apt_ignore_key_error }}"
tags:
- configure_docker_repo
when: docker_add_repo when: docker_add_repo
- name: Ensure curl is present (on older systems without SNI). - name: Ensure curl is present (on older systems without SNI).
@ -35,14 +33,10 @@
args: args:
warn: false warn: false
when: docker_add_repo and add_repository_key is failed when: docker_add_repo and add_repository_key is failed
tags:
- configure_docker_repo
- name: Add Docker repository. - name: Add Docker repository.
apt_repository: apt_repository:
repo: "{{ docker_apt_repository }}" repo: "{{ docker_apt_repository }}"
state: present state: present
update_cache: true update_cache: true
tags:
- configure_docker_repo
when: docker_add_repo when: docker_add_repo

8
tasks/setup-RedHat.yml
View File

@ -11,8 +11,6 @@
rpm_key: rpm_key:
key: https://download.docker.com/linux/centos/gpg key: https://download.docker.com/linux/centos/gpg
state: present state: present
tags:
- configure_docker_repo
when: docker_add_repo when: docker_add_repo
- name: Add Docker repository. - name: Add Docker repository.
@ -22,8 +20,6 @@
owner: root owner: root
group: root group: root
mode: 0644 mode: 0644
tags:
- configure_docker_repo
when: docker_add_repo when: docker_add_repo
- name: Configure Docker Edge repo. - name: Configure Docker Edge repo.
@ -32,8 +28,6 @@
section: 'docker-{{ docker_edition }}-edge' section: 'docker-{{ docker_edition }}-edge'
option: enabled option: enabled
value: '{{ docker_yum_repo_enable_edge }}' value: '{{ docker_yum_repo_enable_edge }}'
tags:
- configure_docker_repo
when: docker_add_repo when: docker_add_repo
- name: Configure Docker Test repo. - name: Configure Docker Test repo.
@ -42,6 +36,4 @@
section: 'docker-{{ docker_edition }}-test' section: 'docker-{{ docker_edition }}-test'
option: enabled option: enabled
value: '{{ docker_yum_repo_enable_test }}' value: '{{ docker_yum_repo_enable_test }}'
tags:
- configure_docker_repo
when: docker_add_repo when: docker_add_repo