summaryrefslogtreecommitdiff
path: root/test/apiv2/python/rest_api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-18 15:42:06 -0500
committerGitHub <noreply@github.com>2022-01-18 15:42:06 -0500
commit094b11cbcb528a7d120c31402a1bcd9c82d84938 (patch)
tree3ce00f13dda775d979a093658f26cea4122646d9 /test/apiv2/python/rest_api
parent62212dbf490d736ad06523a92345a480e4972dab (diff)
parentc0e07234631cfcea1d6724c05606964a4d833f39 (diff)
downloadpodman-094b11cbcb528a7d120c31402a1bcd9c82d84938.tar.gz
podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.tar.bz2
podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.zip
Merge pull request #12908 from Luap99/network-conf-dir
rename --cni-config-dir to --network-config-dir
Diffstat (limited to 'test/apiv2/python/rest_api')
-rw-r--r--test/apiv2/python/rest_api/fixtures/podman.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/apiv2/python/rest_api/fixtures/podman.py b/test/apiv2/python/rest_api/fixtures/podman.py
index bae04f87d..c700571b9 100644
--- a/test/apiv2/python/rest_api/fixtures/podman.py
+++ b/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(