docker: simplify systemd dependencies by allowing host to container b…

…ind mount propagation instead
saltyorg · Jan 6, 2025 · 7793004 · 7793004
1 parent 090c04f
commit 7793004
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 30 deletions.
diff --git a/inventories/group_vars/all.yml b/inventories/group_vars/all.yml
@@ -376,7 +376,7 @@ docker_volumes_downloads_common: "{{ docker_volumes_downloads_nzbs + docker_volu
                                   else [downloads_root_path + ':/downloads'] }}"
 
 docker_volumes_common_folders:
-  - "/mnt:/mnt"
+  - "/mnt:/mnt:rslave"
 
 docker_volumes_common: "{{ docker_volumes_common_folders + docker_volumes_downloads_common
                         if (lookup('vars', traefik_role_var + '_docker_volumes_download', default=true) | bool)

diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
@@ -34,16 +34,6 @@
     docker_controller_service_running: "{{ (services['saltbox_managed_docker_controller.service'] is defined) and (services['saltbox_managed_docker_controller.service']['state'] == 'running') }}"
   when: docker_binary.stat.exists
 
-- name: Initialize '_remotes_services_list' variable
-  ansible.builtin.set_fact:
-    _remotes_services_list: ""
-
-- name: Set '_remotes_services_list' variable
-  ansible.builtin.set_fact:
-    _remotes_services_list: "{{ _remotes_services_list | default('') + (rclone_service_template + rclone_remote_name + '.service ') }}"
-  with_items: "{{ rclone.remotes }}"
-  when: rclone_remote_is_defined and use_remote and item.settings.template != "nfs" and item.settings.mount
-
 - name: Tasks for when Docker exists and is running
   when: docker_service_check
   block:

diff --git a/roles/docker/templates/override.conf.j2 b/roles/docker/templates/override.conf.j2
@@ -9,13 +9,7 @@
 #########################################################################
 
 [Unit]
-{% if rclone_remote_is_defined and use_remote and not continuous_integration %}
-After={{ _remotes_services_list | default('') }}{{ docker_service_after }}
-Requires={{ _remotes_services_list | default('') }}{{ docker_service_after }}
-{% else %}
 After={{ docker_service_after }}
-Requires={{ docker_service_after }}
-{% endif %}
 Wants=saltbox_managed_docker_controller_helper.service saltbox_managed_docker_update_hosts.service
 
 [Service]

diff --git a/roles/unionfs/tasks/subtasks/docker/daemon.yml b/roles/unionfs/tasks/subtasks/docker/daemon.yml
@@ -7,16 +7,6 @@
 #                   GNU General Public License v3.0                     #
 #########################################################################
 ---
-- name: "Docker | Daemon | Initialize '_remotes_services_list' variable"
-  ansible.builtin.set_fact:
-    _remotes_services_list: ""
-
-- name: "Docker | Daemon | Set '_remotes_services_list' variable"
-  ansible.builtin.set_fact:
-    _remotes_services_list: "{{ _remotes_services_list | default('') + (rclone_service_template + rclone_remote_name + '.service ') }}"
-  with_items: "{{ rclone.remotes }}"
-  when: rclone_remote_is_defined and use_remote and item.settings.template != "nfs" and item.settings.mount
-
 - name: "Docker | Daemon | Create override directory"
   ansible.builtin.file:
     path: "/etc/systemd/system/docker.service.d"

diff --git a/roles/unionfs/tasks/subtasks/variables.yml b/roles/unionfs/tasks/subtasks/variables.yml
@@ -7,9 +7,6 @@
 #                   GNU General Public License v3.0                      #
 ##########################################################################
 ---
-################################
-# Remotes List
-################################
 - name: Variables | Set '_remotes_list' variable
   ansible.builtin.set_fact:
     _remotes_list: "{{ _remotes_list | default('') + '/mnt/remote/' + (item.remote.split(':')[0] if ':' in item.remote else item.remote) + '=' + mergerfs_remote_branch_mode_lookup + ':' }}"