Mirrors/mash-playbook
2
0
Fork 0
mirror of https://github.com/mother-of-all-self-hosting/mash-playbook synced 2024-11-10 06:14:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support easily passing additional Docker daemon options

Browse source 
Provoked by: https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3247#issuecomment-2067207227
This commit is contained in:
Slavi Pantaleev 2024-04-20 08:18:01 +03:00
parent 227cbe3c33
commit 687e1bd001
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/mash/playbook_base/defaults/main.yml
View file

@ -65,6 +65,14 @@ mash_playbook_reverse_proxy_type: none
# Also see `devture_docker_sdk_for_python_installation_enabled`. # Also see `devture_docker_sdk_for_python_installation_enabled`.
mash_playbook_docker_installation_enabled: false mash_playbook_docker_installation_enabled: false
mash_playbook_docker_installation_daemon_options: "{{ mash_playbook_docker_installation_daemon_options_auto | combine(mash_playbook_docker_installation_daemon_options_custom, recursive=True) }}"
mash_playbook_docker_installation_daemon_options_auto:
experimental: "{{ devture_systemd_docker_base_ipv6_enabled }}"
ip6tables: "{{ devture_systemd_docker_base_ipv6_enabled }}"
mash_playbook_docker_installation_daemon_options_custom: {}
# Controls whether to attach Traefik labels to services. # Controls whether to attach Traefik labels to services.
# This is separate from `devture_traefik_enabled`, because you may wish to disable Traefik installation by the playbook, # This is separate from `devture_traefik_enabled`, because you may wish to disable Traefik installation by the playbook,
# yet still use Traefik installed in another way. # yet still use Traefik installed in another way.

8
templates/group_vars_mash_servers
View file

@ -1016,13 +1016,7 @@ devture_playbook_state_preserver_commit_hash_preservation_dst: "{{ mash_playbook
# # # #
######################################################################## ########################################################################
docker_daemon_options: | docker_daemon_options: "{{ mash_playbook_docker_installation_daemon_options }}"
{{
{
'experimental': devture_systemd_docker_base_ipv6_enabled,
'ip6tables': devture_systemd_docker_base_ipv6_enabled,
}
}}
######################################################################## ########################################################################
# # # #