From 615a9e9f78eee0038b8803eb1223541fe28c6e16 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 13 Apr 2019 06:12:11 -0400 Subject: Internal names do not match external names We refer to the pause_image and pause_container in the libpod.conf description, but internally we had infra_image and infra_container. This means it the user made changes to the conf, it would not effect the actual tool using libpod. Signed-off-by: Daniel J Walsh --- libpod/testdata/config.toml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 libpod/testdata/config.toml (limited to 'libpod/testdata/config.toml') diff --git a/libpod/testdata/config.toml b/libpod/testdata/config.toml deleted file mode 100644 index 1d78f2083..000000000 --- a/libpod/testdata/config.toml +++ /dev/null @@ -1,28 +0,0 @@ -[crio] - root = "/var/lib/containers/storage" - runroot = "/var/run/containers/storage" - storage_driver = "overlay2" - log_dir = "/var/log/crio/pods" - file_locking = true - [crio.runtime] - runtime = "/usr/bin/runc" - runtime_untrusted_workload = "" - default_workload_trust = "trusted" - conmon = "/usr/local/libexec/crio/conmon" - conmon_env = ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"] - selinux = true - seccomp_profile = "/etc/crio/seccomp.json" - apparmor_profile = "crio-default" - cgroup_manager = "cgroupfs" - hooks_dir = ["/usr/share/containers/oci/hooks.d"] - pids_limit = 2048 - container_exits_dir = "/var/run/podman/exits" - [crio.image] - default_transport = "docker://" - pause_image = "kubernetes/pause" - pause_command = "/pause" - signature_policy = "" - image_volumes = "mkdir" - [crio.network] - network_dir = "/etc/cni/net.d/" - plugin_dir = "/opt/cni/bin/" -- cgit v1.2.3-54-g00ecf