opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-05 19:16:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename --cni-config-dir to --network-config-dir

Browse Source 
Since this option will also be used for netavark we should rename it to
something more generic. It is important that --cni-config-dir still
works otherwise we could break existing container cleanup commands.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-01-18 16:17:53 +01:00
parent 55ad6188b0
commit c0e0723463
14 changed files with 57 additions and 24 deletions
cmd/podman
root.go
contrib/cirrus
logformatterlogformatter.t
docs/source/markdown
podman.1.md
hack
podman-socat
pkg
bindings/test
common_test.go
domain/infra
runtime_libpod.go
specgenutil
util.go
test
apiv2/python/rest_api/fixtures
podman.py
compose
test-compose
e2e
common_test.golibpod_suite_remote_test.gonetwork_test.go
python/docker
__init__.py

2
test/apiv2/python/rest_api/fixtures/podman.py

@ -44,7 +44,7 @@ class Podman:
os.environ["CNI_CONFIG_PATH"] = os.path.join(self.anchor_directory, "cni", "net.d")
os.makedirs(os.environ["CNI_CONFIG_PATH"], exist_ok=True)
self.cmd.append("--cni-config-dir=" + os.environ["CNI_CONFIG_PATH"])
self.cmd.append("--network-config-dir=" + os.environ["CNI_CONFIG_PATH"])
cni_cfg = os.path.join(os.environ["CNI_CONFIG_PATH"], "87-podman-bridge.conflist")
# json decoded and encoded to ensure legal json
buf = json.loads(