summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2016-11-09 13:24:07 -0500
committerRussell Teague <rteague@redhat.com>2016-11-11 09:50:34 -0500
commitb300b2e3563f406058b6c29d61a9ec7fb6969cab (patch)
treeacaaaf77e7bf4504fca857a4bd23b96532ad1a07 /roles/docker/templates
parent24804da994917f50be32e2c5fb62e2e120e6652f (diff)
downloadopenshift-b300b2e3563f406058b6c29d61a9ec7fb6969cab.tar.gz
openshift-b300b2e3563f406058b6c29d61a9ec7fb6969cab.tar.bz2
openshift-b300b2e3563f406058b6c29d61a9ec7fb6969cab.tar.xz
openshift-b300b2e3563f406058b6c29d61a9ec7fb6969cab.zip
Resolve docker and iptables service dependencies
The docker service adds rules to the iptables configuration to support proper network functionality for running containers. If the service is started prior to iptables, these rules are not properly created. * Ensure iptables is started prior to docker Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1390835
Diffstat (limited to 'roles/docker/templates')
-rw-r--r--roles/docker/templates/custom.conf.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/docker/templates/custom.conf.j2 b/roles/docker/templates/custom.conf.j2
new file mode 100644
index 000000000..53ed56abc
--- /dev/null
+++ b/roles/docker/templates/custom.conf.j2
@@ -0,0 +1,5 @@
+# {{ ansible_managed }}
+
+[Unit]
+Requires=iptables.service
+After=iptables.service