Skip to content

Commit 4a2030f

Browse files
committed
docker: ensure docker controller runs until controller helper is done during shutdown
1 parent d47258b commit 4a2030f

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

roles/docker/tasks/subtasks/controller.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
method: POST
8989
timeout: 600
9090

91-
- name: Controller | Import 'saltbox_managed_docker_controller.service'
91+
- name: Controller | Import 'saltbox_managed_docker_controller_helper.service'
9292
ansible.builtin.template:
9393
src: docker-controller-helper.service.j2
9494
dest: /etc/systemd/system/saltbox_managed_docker_controller_helper.service

roles/docker/templates/docker-controller-helper.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[Unit]
1212
Description=Saltbox Docker Controller Helper
1313
BindsTo=docker.service
14-
After=docker.service
14+
After=docker.service saltbox_managed_docker_controller_helper.service
1515

1616
[Service]
1717
ExecStart=/srv/ansible/venv/bin/python3 /srv/git/saltbox/scripts/saltbox_docker_controller_helper.py

roles/docker/templates/docker-controller.service.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
[Unit]
1212
Description=Saltbox Docker Controller
13+
After=docker.service
1314

1415
[Service]
1516
Type=simple

0 commit comments

Comments
 (0)