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

Add name to include_tasks/import_tasks

Browse Source
This commit is contained in:
c4605 2019-03-02 23:44:03 +08:00
parent fa1a56824e
commit da82b46d5a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tasks/main.yml
View File

@ -1,8 +1,10 @@
--- ---
- include_tasks: setup-RedHat.yml - name: Include setup RedHat tasks
include_tasks: setup-RedHat.yml
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'
- include_tasks: setup-Debian.yml - name: Include setup Debian tasks
include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian' when: ansible_os_family == 'Debian'
- name: Install Docker. - name: Install Docker.
@ -12,7 +14,8 @@
notify: restart docker notify: restart docker
# TODO: Remove this shim once 18.09.1 or later is released. # TODO: Remove this shim once 18.09.1 or later is released.
- import_tasks: docker-1809-shim.yml - name: Import systemd shim tasks
import_tasks: docker-1809-shim.yml
when: ansible_service_mgr == 'systemd' when: ansible_service_mgr == 'systemd'
- name: Ensure Docker is started and enabled at boot. - name: Ensure Docker is started and enabled at boot.
@ -24,8 +27,10 @@
- name: Ensure handlers are notified now to avoid firewall conflicts. - name: Ensure handlers are notified now to avoid firewall conflicts.
meta: flush_handlers meta: flush_handlers
- include_tasks: docker-compose.yml - name: Include install docker compose tasks
include_tasks: docker-compose.yml
when: docker_install_compose when: docker_install_compose
- include_tasks: docker-users.yml - name: Include create docker users tasks
include_tasks: docker-users.yml
when: docker_users when: docker_users