Override Systemd conf when hosts is defined

This commit is contained in:
Florent David 2022-05-01 15:00:06 +02:00
parent 5b8e39b38e
commit a1aa622a67
3 changed files with 29 additions and 3 deletions

View File

@ -0,0 +1,3 @@
[Service]
ExecStart=
ExecStart=/usr/bin/dockerd --containerd=/run/containerd/containerd.sock

View File

@ -1,4 +1,8 @@
---
- name: reload systemd
systemd:
daemon_reload: true
- name: restart docker
service: "name=docker state={{ docker_restart_handler_state }}"
ignore_errors: "{{ ansible_check_mode }}"

View File

@ -29,6 +29,25 @@
mode: 0755
when: docker_daemon_options.keys() | length > 0
- name: Override Docker Systemd configuration.
block:
- name: Create Docker Systemd directory.
file:
path: /etc/systemd/system/docker.service.d
owner: root
group: root
mode: 0755
state: directory
- name: Copy Systemd patch.
copy:
src: systemd-override.conf
dest: /etc/systemd/system/docker.service.d/override.conf
owner: root
group: root
mode: 0644
notify: reload systemd
when: "'hosts' in docker_daemon_options.keys()"
- name: Configure Docker daemon options.
copy:
content: "{{ docker_daemon_options | to_nice_json }}"
@ -37,6 +56,9 @@
when: docker_daemon_options.keys() | length > 0
notify: restart docker
- name: Ensure handlers are notified now to avoid firewall conflicts.
meta: flush_handlers
- name: Ensure Docker is started and enabled at boot.
service:
name: docker
@ -44,9 +66,6 @@
enabled: "{{ docker_service_enabled }}"
ignore_errors: "{{ ansible_check_mode }}"
- name: Ensure handlers are notified now to avoid firewall conflicts.
meta: flush_handlers
- include_tasks: docker-compose.yml
when: docker_install_compose | bool