summaryrefslogtreecommitdiff
path: root/pkg/machine/ignition.go
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2022-01-20 18:52:36 +0100
committerPaul Holzinger <pholzing@redhat.com>2022-01-20 19:08:15 +0100
commitee039b7403b55b1d4f85b5527a8caee09fa30844 (patch)
tree1da010a6254a43d7eca109676cfbb90fd7b2ce5c /pkg/machine/ignition.go
parent206e57e5b012ae03315dfb84735d034dd9cfd26e (diff)
downloadpodman-ee039b7403b55b1d4f85b5527a8caee09fa30844.tar.gz
podman-ee039b7403b55b1d4f85b5527a8caee09fa30844.tar.bz2
podman-ee039b7403b55b1d4f85b5527a8caee09fa30844.zip
Remove rootless_networking option from containers.conf
This field was only needed for machine to force cni, however you can set netns="bridge" in the config to have the same effect. This is already done in the machine setup. see https://github.com/containers/common/pull/895 [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/machine/ignition.go')
-rw-r--r--pkg/machine/ignition.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkg/machine/ignition.go b/pkg/machine/ignition.go
index 09228553c..ca6abd48c 100644
--- a/pkg/machine/ignition.go
+++ b/pkg/machine/ignition.go
@@ -243,7 +243,6 @@ ExecStart=/usr/bin/sleep infinity
`
containers := `[containers]
netns="bridge"
-rootless_networking="cni"
`
rootContainers := `[engine]
machine_enabled=true