From 677b7ecd896b5b7943e7c5cd19f59c89d4df756d Mon Sep 17 00:00:00 2001
From: Victor Morales <chipahuac@hotmail.com>
Date: Thu, 2 Mar 2023 18:30:57 -0800
Subject: [PATCH] Drop crun_bin_dir unused var (#9845)
crun_bin_dir was used to specify the destination of the crun binary during the
download process. This path must match with the value provided in the CRI-O
configuration file. So changing its value to bin_dir helps to mismatch errors.
Signed-off-by: Victor Morales <chipahuac@hotmail.com>
---
roles/container-engine/crun/defaults/main.yml | 3 ---
roles/container-engine/crun/tasks/main.yml | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
delete mode 100644 roles/container-engine/crun/defaults/main.yml
diff --git a/roles/container-engine/crun/defaults/main.yml b/roles/container-engine/crun/defaults/main.yml
deleted file mode 100644
index 65e08d7e1..000000000
--- a/roles/container-engine/crun/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-crun_bin_dir: /usr/bin/
diff --git a/roles/container-engine/crun/tasks/main.yml b/roles/container-engine/crun/tasks/main.yml
index d541a49fc..a1d29a78f 100644
--- a/roles/container-engine/crun/tasks/main.yml
+++ b/roles/container-engine/crun/tasks/main.yml
@@ -7,6 +7,6 @@
- name: Copy crun binary from download dir
copy:
src: "{{ local_release_dir }}/crun"
- dest: "{{ crun_bin_dir }}/crun"
+ dest: "{{ bin_dir }}/crun"
mode: 0755
remote_src: true
--
GitLab