diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-23 23:44:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 23:44:59 +0100 |
| commit | 4fe7c3f7bc8a1d20a23e87783b6a17b887c782e1 (patch) | |
| tree | 5a1bf405ca0a8281834184f2f66380100f65db9f /test/apiv2/rest_api/__init__.py | |
| parent | cd6c4cb0affdb1e8a647079b2808da6bf833d543 (diff) | |
| parent | 1ddb19bc8e5ba036a3539fe63c6b9fb241eea099 (diff) | |
| download | podman-4fe7c3f7bc8a1d20a23e87783b6a17b887c782e1.tar.gz podman-4fe7c3f7bc8a1d20a23e87783b6a17b887c782e1.tar.bz2 podman-4fe7c3f7bc8a1d20a23e87783b6a17b887c782e1.zip | |
Merge pull request #8455 from baude/jhoncompat
Jhoncompat
Diffstat (limited to 'test/apiv2/rest_api/__init__.py')
| -rw-r--r-- | test/apiv2/rest_api/__init__.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/test/apiv2/rest_api/__init__.py b/test/apiv2/rest_api/__init__.py index 8100a4df5..db0257f03 100644 --- a/test/apiv2/rest_api/__init__.py +++ b/test/apiv2/rest_api/__init__.py @@ -16,19 +16,18 @@ class Podman(object): binary = os.getenv("PODMAN", "bin/podman") self.cmd = [binary, "--storage-driver=vfs"] - cgroupfs = os.getenv("CGROUP_MANAGER", "cgroupfs") + cgroupfs = os.getenv("CGROUP_MANAGER", "systemd") self.cmd.append(f"--cgroup-manager={cgroupfs}") if os.getenv("DEBUG"): self.cmd.append("--log-level=debug") + self.cmd.append("--syslog=true") self.anchor_directory = tempfile.mkdtemp(prefix="podman_restapi_") self.cmd.append("--root=" + os.path.join(self.anchor_directory, "crio")) self.cmd.append("--runroot=" + os.path.join(self.anchor_directory, "crio-run")) - os.environ["REGISTRIES_CONFIG_PATH"] = os.path.join( - self.anchor_directory, "registry.conf" - ) + os.environ["REGISTRIES_CONFIG_PATH"] = os.path.join(self.anchor_directory, "registry.conf") p = configparser.ConfigParser() p.read_dict( { @@ -40,14 +39,10 @@ class Podman(object): with open(os.environ["REGISTRIES_CONFIG_PATH"], "w") as w: p.write(w) - os.environ["CNI_CONFIG_PATH"] = os.path.join( - self.anchor_directory, "cni", "net.d" - ) + 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"]) - cni_cfg = os.path.join( - os.environ["CNI_CONFIG_PATH"], "87-podman-bridge.conflist" - ) + 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( """ |