summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-14 11:14:55 -0500
committerGitHub <noreply@github.com>2017-11-14 11:14:55 -0500
commit2e6369358b8ec30cb3031ec5de9f126f07c12521 (patch)
treeaffaf973b7cec02d34c620c28ae605494e443c15
parentb1b83e5dce08b25558d047fd44a98c64b646d4b3 (diff)
parent815afe20035104bd81aef8071287c144a15d30d7 (diff)
downloadopenshift-2e6369358b8ec30cb3031ec5de9f126f07c12521.tar.gz
openshift-2e6369358b8ec30cb3031ec5de9f126f07c12521.tar.bz2
openshift-2e6369358b8ec30cb3031ec5de9f126f07c12521.tar.xz
openshift-2e6369358b8ec30cb3031ec5de9f126f07c12521.zip
Merge pull request #5942 from giuseppe/crio-sync-configuration
crio: sync crio.conf
-rw-r--r--roles/docker/templates/crio.conf.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/docker/templates/crio.conf.j2 b/roles/docker/templates/crio.conf.j2
index 93014a80d..3f066a17f 100644
--- a/roles/docker/templates/crio.conf.j2
+++ b/roles/docker/templates/crio.conf.j2
@@ -103,6 +103,11 @@ cgroup_manager = "systemd"
# hooks_dir_path is the oci hooks directory for automatically executed hooks
hooks_dir_path = "/usr/share/containers/oci/hooks.d"
+# default_mounts is the mounts list to be mounted for the container when created
+default_mounts = [
+ "/usr/share/rhel/secrets:/run/secrets",
+]
+
# pids_limit is the number of processes allowed in a container
pids_limit = 1024