diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-09 15:04:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 15:04:32 -0400 |
| commit | 4c15d9c27286ab68251444143650eb5a2c2641a3 (patch) | |
| tree | d8d448083845655b81d80f9c1696ad31a8542b19 /roles/docker/templates | |
| parent | f8d96e8f6639c09cf7847d67411fd71ece1624b7 (diff) | |
| parent | 91892aad5f5225daead96cb9dd8f7263f0212a2b (diff) | |
| download | openshift-4c15d9c27286ab68251444143650eb5a2c2641a3.tar.gz openshift-4c15d9c27286ab68251444143650eb5a2c2641a3.tar.bz2 openshift-4c15d9c27286ab68251444143650eb5a2c2641a3.tar.xz openshift-4c15d9c27286ab68251444143650eb5a2c2641a3.zip | |
Merge pull request #5705 from mgugino-upstream-stage/docker-partof-iptables
Add PartOf to docker systemd service unit.
Diffstat (limited to 'roles/docker/templates')
| -rw-r--r-- | roles/docker/templates/custom.conf.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/docker/templates/custom.conf.j2 b/roles/docker/templates/custom.conf.j2 index 9b47cb6ab..713412473 100644 --- a/roles/docker/templates/custom.conf.j2 +++ b/roles/docker/templates/custom.conf.j2 @@ -3,3 +3,9 @@ [Unit] Wants=iptables.service After=iptables.service + +# The following line is a work-around to ensure docker is restarted whenever +# iptables is restarted. This ensures the proper iptables rules will be in +# place for docker. +# Note: This will also cause docker to be stopped if iptables is stopped. +PartOf=iptables.service |