From a8c1bccdd58849395b32a8d11d8e914f52e7fca3 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Thu, 17 Aug 2023 19:17:22 +0200
Subject: [PATCH] Move runroot from crio.conf to storage.conf (#10372)

---
 roles/container-engine/cri-o/tasks/main.yaml        | 2 ++
 roles/container-engine/cri-o/templates/crio.conf.j2 | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml
index 6344f0393..f5df97467 100644
--- a/roles/container-engine/cri-o/tasks/main.yaml
+++ b/roles/container-engine/cri-o/tasks/main.yaml
@@ -133,6 +133,8 @@
       value: '"overlay"'
     - option: graphroot
       value: '"/var/lib/containers/storage"'
+    - option: runroot
+      value: '"/var/run/containers/storage"'
 
 # metacopy=on is available since 4.19 and was backported to RHEL 4.18 kernel
 - name: Cri-o | set metacopy mount options correctly
diff --git a/roles/container-engine/cri-o/templates/crio.conf.j2 b/roles/container-engine/cri-o/templates/crio.conf.j2
index f882ed620..80dc80d05 100644
--- a/roles/container-engine/cri-o/templates/crio.conf.j2
+++ b/roles/container-engine/cri-o/templates/crio.conf.j2
@@ -20,7 +20,8 @@
 root = "/var/lib/containers/storage"
 
 # Path to the "run directory". CRI-O stores all of its state in this directory.
-runroot = "/var/run/containers/storage"
+# Read from /etc/containers/storage.conf first so unnecessary here
+# runroot = "/var/run/containers/storage"
 
 # Storage driver used to manage the storage of images and containers. Please
 # refer to containers-storage.conf(5) to see all available storage drivers.