From b7a9217d777dcc8f1c8406dcdd580b2a3ced047e Mon Sep 17 00:00:00 2001
From: qlijin <qlijin@gmail.com>
Date: Fri, 19 May 2023 06:46:33 +0800
Subject: [PATCH] Some update for the deploy on fedora coreos: (#10030)

- Test with new version: 37.20230322.3.0. Both containerd and
  cri-o is tested
- bugfix: when we use crio and the var bin_dir is changed,
  there will be some error about the new bin dir.
---
 docs/fcos.md                                        | 2 +-
 roles/container-engine/cri-o/tasks/main.yaml        | 7 +++++++
 roles/container-engine/cri-o/templates/crio.conf.j2 | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/fcos.md b/docs/fcos.md
index 238bdf4cf..c1fe4b7af 100644
--- a/docs/fcos.md
+++ b/docs/fcos.md
@@ -1,6 +1,6 @@
 # Fedora CoreOS
 
-Tested with stable version 34.20210611.3.0
+Tested with stable version 37.20230322.3.0
 
 Because package installation with `rpm-ostree` requires a reboot, playbook may fail while bootstrap.
 Restart playbook again.
diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml
index 2d45e653f..d6c7eb099 100644
--- a/roles/container-engine/cri-o/tasks/main.yaml
+++ b/roles/container-engine/cri-o/tasks/main.yaml
@@ -90,6 +90,13 @@
     remote_src: true
   notify: restart crio
 
+- name: cri-o | update the bin dir for crio.service file
+  replace:
+    dest: /etc/systemd/system/crio.service
+    regexp: "/usr/local/bin/crio"
+    replace: "{{ bin_dir }}/crio"
+  notify: restart crio
+
 - name: cri-o | copy default policy
   copy:
     src: "{{ local_release_dir }}/cri-o/contrib/policy.json"
diff --git a/roles/container-engine/cri-o/templates/crio.conf.j2 b/roles/container-engine/cri-o/templates/crio.conf.j2
index 177d2a3f5..8409feacb 100644
--- a/roles/container-engine/cri-o/templates/crio.conf.j2
+++ b/roles/container-engine/cri-o/templates/crio.conf.j2
@@ -269,7 +269,11 @@ manage_ns_lifecycle = false
 namespaces_dir = "/var/run"
 
 # pinns_path is the path to find the pinns binary, which is needed to manage namespace lifecycle
+{% if bin_dir == "/usr/local/bin" %}
 pinns_path = ""
+{% else %}
+pinns_path = "{{ bin_dir }}/pinns"
+{% endif %}
 
 # The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes.
 # The runtime to use is picked based on the runtime_handler provided by the CRI.