opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-10 09:47:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12908 from Luap99/network-conf-dir

Browse Source 
rename --cni-config-dir to --network-config-dir
This commit is contained in:
OpenShift Merge Robot
2022-01-18 15:42:06 -05:00
committed by GitHub
parent 62212dbf49 c0e0723463
commit 094b11cbcb
14 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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(