Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure containerd service unmasking #8726

Merged
merged 4 commits into from
Apr 29, 2022
Merged

Ensure containerd service unmasking #8726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e05e1c
Force containerd service unmasking
rickerc Apr 18, 2022
6c6dcaa
Eliminate restart and move unmasking step
rickerc Apr 19, 2022
ed9fa2d
Add unmasking to similar container runtimes
rickerc Apr 27, 2022
8e2dc6e
Add missing service names
rickerc Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions roles/container-engine/containerd/handlers/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
state: restarted
enabled: yes
daemon-reload: yes
masked: no

- name: Containerd | wait for containerd
command: "{{ containerd_bin_dir }}/ctr images ls -q"
Expand Down
3 changes: 2 additions & 1 deletion roles/container-engine/containerd/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@
meta: flush_handlers

- name: containerd | Ensure containerd is started and enabled
service:
systemd:
name: containerd
daemon_reload: yes
enabled: yes
state: started
2 changes: 2 additions & 0 deletions roles/container-engine/cri-dockerd/handlers/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

- name: cri-dockerd | reload systemd
systemd:
name: cri-dockerd
daemon_reload: true
masked: no

- name: cri-dockerd | reload cri-dockerd.socket
service:
Expand Down
2 changes: 2 additions & 0 deletions roles/container-engine/docker/handlers/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@

- name: Docker | reload systemd
systemd:
name: docker
daemon_reload: true
masked: no

- name: Docker | reload docker.socket
service:
Expand Down