Merge pull request #2919 from rhatdan/infra_command

Internal names do not match external names

3 files changed, 9 insertions, 37 deletions

diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md
index 777edeacb..4abbcd8b0 100644
--- a/docs/libpod.conf.5.md
+++ b/docs/libpod.conf.5.md
@@ -65,13 +65,13 @@ libpod to manage containers.
 **cni_plugin_dir**=""
   Directories where CNI plugin binaries may be located
 
-**pause_image** = ""
-  Pause container image name for pod pause containers.  When running a pod, we
-  start a `pause` processes in a container to hold open the namespaces associated with the
+**infra_image** = ""
+  Infra (pause) container image name for pod infra containers.  When running a pod, we
+  start a `pause` process in a container to hold open the namespaces associated with the
   pod.  This container and process, basically sleep/pause for the lifetime of the pod.
 
-**pause_command**=""
-  Command to run the pause container
+**infra_command**=""
+  Command to run the infra container
 
 **namespace**=""
   Default libpod namespace. If libpod is joined to a namespace, it will see only containers and pods
diff --git a/libpod.conf b/libpod.conf
index 211ba106d..80422e3dd 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -71,11 +71,11 @@ cni_default_network = "podman"
 # namespace is set, all containers and pods are visible.
 #namespace = ""
 
-# Default pause image name for pod pause containers
-pause_image = "k8s.gcr.io/pause:3.1"
+# Default infra (pause) image name for pod infra containers
+infra_image = "k8s.gcr.io/pause:3.1"
 
-# Default command to run the pause container
-pause_command = "/pause"
+# Default command to run the infra container
+infra_command = "/pause"
 
 # Determines whether libpod will reserve ports on the host when they are
 # forwarded to containers. When enabled, when ports are forwarded to containers,
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/"