diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-10 19:38:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-10 19:38:49 +0100 |
| commit | 2343161593dc5c2a869849a37e08f84468a6bca9 (patch) | |
| tree | 3c7fe9a68d5f8d3c48c73fc6e89c64bd04a3f15a /test/apiv2 | |
| parent | 786757fb01208cf72e1c67611acbab1411746036 (diff) | |
| parent | c9ef2607104a0b17e5146b3ee01852edb7d3d688 (diff) | |
| download | podman-2343161593dc5c2a869849a37e08f84468a6bca9.tar.gz podman-2343161593dc5c2a869849a37e08f84468a6bca9.tar.bz2 podman-2343161593dc5c2a869849a37e08f84468a6bca9.zip | |
Merge pull request #9668 from rhatdan/man
Document CONTAINERS_CONF/CONTAINERS_STORAGE_CONF Env variables
Diffstat (limited to 'test/apiv2')
| -rw-r--r-- | test/apiv2/rest_api/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/apiv2/rest_api/__init__.py b/test/apiv2/rest_api/__init__.py index db0257f03..b7b8a7649 100644 --- a/test/apiv2/rest_api/__init__.py +++ b/test/apiv2/rest_api/__init__.py @@ -27,7 +27,7 @@ class Podman(object): 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["CONTAINERS_REGISTRIES_CONF"] = os.path.join(self.anchor_directory, "registry.conf") p = configparser.ConfigParser() p.read_dict( { @@ -36,7 +36,7 @@ class Podman(object): "registries.block": {"registries": "[]"}, } ) - with open(os.environ["REGISTRIES_CONFIG_PATH"], "w") as w: + with open(os.environ["CONTAINERS_REGISTRIES_CONF"], "w") as w: p.write(w) os.environ["CNI_CONFIG_PATH"] = os.path.join(self.anchor_directory, "cni", "net.d") |