Skip to content

Commit

Permalink
various: remove always restart
Browse files Browse the repository at this point in the history
docker: block controller during helper script setup
  • Loading branch information
saltydk committed Dec 31, 2023
1 parent f482f68 commit 1d9dafe
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 13 deletions.
2 changes: 1 addition & 1 deletion roles/authelia/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ authelia_docker_security_opts: "{{ authelia_docker_security_opts_default
+ authelia_docker_security_opts_custom }}"

# Restart Policy
authelia_docker_restart_policy: always
authelia_docker_restart_policy: unless-stopped

# State
authelia_docker_state: started
Expand Down
2 changes: 1 addition & 1 deletion roles/ddns/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ddns_docker_security_opts: "{{ ddns_docker_security_opts_default
+ ddns_docker_security_opts_custom }}"

# Restart Policy
ddns_docker_restart_policy: always
ddns_docker_restart_policy: unless-stopped

# State
ddns_docker_state: started
Expand Down
14 changes: 7 additions & 7 deletions roles/docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,13 @@
ansible.builtin.import_tasks: "subtasks/controller.yml"
when: not docker_service_check

- name: Unblock Docker Controller
ansible.builtin.uri:
url: "{{ docker_controller_url }}/unblock"
method: POST
timeout: 600
ignore_errors: true

- name: Stop Saltbox Containers
ansible.builtin.uri:
url: "{{ docker_controller_url }}/stop"
Expand Down Expand Up @@ -180,10 +187,3 @@
ansible.builtin.include_role:
name: ctop
tags: ctop

- name: Unblock Docker Controller
ansible.builtin.uri:
url: "{{ docker_controller_url }}/unblock"
method: POST
timeout: 600
ignore_errors: true
14 changes: 14 additions & 0 deletions roles/docker/tasks/subtasks/controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@
ansible.builtin.wait_for:
timeout: "10"

- name: Block Docker Controller
ansible.builtin.uri:
url: "{{ docker_controller_url }}/block/20"
method: POST
timeout: 600
ignore_errors: true

- name: Controller | Import 'saltbox_managed_docker_controller.service'
ansible.builtin.template:
src: docker-controller-helper.service.j2
Expand All @@ -74,3 +81,10 @@
enabled: true
state: started
daemon_reload: true

- name: Unblock Docker Controller
ansible.builtin.uri:
url: "{{ docker_controller_url }}/unblock"
method: POST
timeout: 600
ignore_errors: true
2 changes: 1 addition & 1 deletion roles/jaeger/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jaeger_docker_security_opts: "{{ jaeger_docker_security_opts_default
+ jaeger_docker_security_opts_custom }}"

# Restart Policy
jaeger_docker_restart_policy: always
jaeger_docker_restart_policy: unless-stopped

# State
jaeger_docker_state: started
2 changes: 1 addition & 1 deletion roles/lldap/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ lldap_docker_security_opts: "{{ lldap_docker_security_opts_default
+ lldap_docker_security_opts_custom }}"

# Restart Policy
lldap_docker_restart_policy: always
lldap_docker_restart_policy: unless-stopped

# State
lldap_docker_state: started
2 changes: 1 addition & 1 deletion roles/redis/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ redis_docker_security_opts: "{{ lookup('vars', redis_name + '_docker_security_op
+ lookup('vars', redis_name + '_docker_security_opts_custom', default=redis_docker_security_opts_custom) }}"

# Restart Policy
redis_docker_restart_policy: always
redis_docker_restart_policy: unless-stopped

# State
redis_docker_state: started
Expand Down
2 changes: 1 addition & 1 deletion roles/traefik/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ traefik_docker_security_opts: "{{ traefik_docker_security_opts_default
+ traefik_docker_security_opts_custom }}"

# Restart Policy
traefik_docker_restart_policy: always
traefik_docker_restart_policy: unless-stopped

# State
traefik_docker_state: started

0 comments on commit 1d9dafe

Please sign in to comment.