diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-05 06:44:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 06:44:40 -0500 |
| commit | 9ffc525da70ba497f38df04dd6d3670170200071 (patch) | |
| tree | 266196128464cef50bd2946a7c43401f3a8e8d02 | |
| parent | 0356c0ed91f17e0276c95be8460348ae470f8e05 (diff) | |
| parent | 05a0bf7c07e53a3142fb4e6d1bb71e60ee16e5c9 (diff) | |
| download | podman-9ffc525da70ba497f38df04dd6d3670170200071.tar.gz podman-9ffc525da70ba497f38df04dd6d3670170200071.tar.bz2 podman-9ffc525da70ba497f38df04dd6d3670170200071.zip | |
Merge pull request #5382 from vrothberg/systemd-network
generate systemd: add network dependencies
| -rw-r--r-- | pkg/systemd/generate/systemdgen.go | 2 | ||||
| -rw-r--r-- | pkg/systemd/generate/systemdgen_test.go | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkg/systemd/generate/systemdgen.go b/pkg/systemd/generate/systemdgen.go index 404347828..999a65126 100644 --- a/pkg/systemd/generate/systemdgen.go +++ b/pkg/systemd/generate/systemdgen.go @@ -80,6 +80,8 @@ const containerTemplate = `# {{.ServiceName}}.service [Unit] Description=Podman {{.ServiceName}}.service Documentation=man:podman-generate-systemd(1) +Wants=network.target +After=network-online.target {{- if .BoundToServices}} RefuseManualStart=yes RefuseManualStop=yes diff --git a/pkg/systemd/generate/systemdgen_test.go b/pkg/systemd/generate/systemdgen_test.go index b74b75258..a68a02d33 100644 --- a/pkg/systemd/generate/systemdgen_test.go +++ b/pkg/systemd/generate/systemdgen_test.go @@ -40,6 +40,8 @@ func TestCreateContainerSystemdUnit(t *testing.T) { [Unit] Description=Podman container-639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401.service Documentation=man:podman-generate-systemd(1) +Wants=network.target +After=network-online.target [Service] Restart=always @@ -58,6 +60,8 @@ WantedBy=multi-user.target` [Unit] Description=Podman container-foobar.service Documentation=man:podman-generate-systemd(1) +Wants=network.target +After=network-online.target [Service] Restart=always @@ -76,6 +80,8 @@ WantedBy=multi-user.target` [Unit] Description=Podman container-foobar.service Documentation=man:podman-generate-systemd(1) +Wants=network.target +After=network-online.target RefuseManualStart=yes RefuseManualStop=yes BindsTo=a.service b.service c.service pod.service @@ -98,6 +104,8 @@ WantedBy=multi-user.target` [Unit] Description=Podman pod-123abc.service Documentation=man:podman-generate-systemd(1) +Wants=network.target +After=network-online.target Requires=container-1.service container-2.service Before=container-1.service container-2.service @@ -118,6 +126,8 @@ WantedBy=multi-user.target` [Unit] Description=Podman jadda-jadda.service Documentation=man:podman-generate-systemd(1) +Wants=network.target +After=network-online.target [Service] Restart=always |