From 1928dafc7e69be0674baa49ae855ef3afdc9d2b5 Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Wed, 16 Jun 2021 19:07:59 +0300
Subject: [PATCH] Revert to conmon location override for Redhat and Fedora
 (#7701)

---
 roles/container-engine/cri-o/vars/fedora.yml | 2 --
 roles/container-engine/cri-o/vars/redhat.yml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/roles/container-engine/cri-o/vars/fedora.yml b/roles/container-engine/cri-o/vars/fedora.yml
index f5fb251d8..730bee962 100644
--- a/roles/container-engine/cri-o/vars/fedora.yml
+++ b/roles/container-engine/cri-o/vars/fedora.yml
@@ -3,8 +3,6 @@ crio_packages:
   - cri-o
   - cri-tools
 
-crio_conmon: /usr/libexec/crio/conmon
-
 # Fedora doesn't have cri-o 1.21 packages
 crio_kubernetes_version_matrix:
   "1.21": "1.20"
diff --git a/roles/container-engine/cri-o/vars/redhat.yml b/roles/container-engine/cri-o/vars/redhat.yml
index c78f6a1d7..c20c9ba8f 100644
--- a/roles/container-engine/cri-o/vars/redhat.yml
+++ b/roles/container-engine/cri-o/vars/redhat.yml
@@ -2,5 +2,3 @@
 crio_packages:
   - cri-o
   - oci-systemd-hook
-
-crio_conmon: /usr/libexec/crio/conmon