Skip to content

Commit 2f54d41

Browse files
committed
docker: ensure br_netfilter is loaded until fixed upstream
1 parent 9325862 commit 2f54d41

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

roles/docker/tasks/subtasks/daemon.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
fixed-cidr-v6: "{{ '2001:db8::/64'
2525
if docker_ipv6
2626
else omit }}"
27+
iptables: true
2728
ip6tables: "{{ true
2829
if docker_ipv6
2930
else false }}"

roles/docker/templates/override.conf.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ Requires={{ docker_service_after }}
1919
Wants=saltbox_managed_docker_controller_helper.service saltbox_managed_docker_update_hosts.service
2020

2121
[Service]
22+
ExecStartPre=modprobe -va bridge br_netfilter
2223
ExecStartPre=/bin/sleep {{ docker_service_sleep }}

0 commit comments

Comments
 (0)