From 8a866dde3c57d1717540e1b642c66ca31bf1590b Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <cyril@redhat.com>
Date: Mon, 30 Sep 2024 16:03:20 +0200
Subject: [PATCH] Remove workaround for eventlet bug #592

This code worked around a bug in eventlet[1] that has been fixed in
115103d5608cbe8f15df10e27eba1644f5364e95. The fix has been available in
every eventlet release since v0.27.0.

[1] https://github.com/eventlet/eventlet/issues/592

Change-Id: I7186af20055ff47ab10c6ff37bca0e3546d4affb
---
 cyborg/cmd/__init__.py | 6 ------
 requirements.txt       | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/cyborg/cmd/__init__.py b/cyborg/cmd/__init__.py
index 6f57a578..fd76ac1b 100644
--- a/cyborg/cmd/__init__.py
+++ b/cyborg/cmd/__init__.py
@@ -17,11 +17,5 @@ import eventlet
 import oslo_i18n as i18n
 
 eventlet.monkey_patch()
-# Monkey patch the original current_thread to use the up-to-date _active
-# global variable. See https://bugs.launchpad.net/bugs/1863021 and
-# https://github.com/eventlet/eventlet/issues/592
-import __original_module_threading as orig_threading  # noqa
-import threading  # noqa
-orig_threading.current_thread.__globals__['_active'] = threading._active
 
 i18n.install('cyborg')
diff --git a/requirements.txt b/requirements.txt
index 98dbc735..2b83da8a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
 pbr>=0.11,!=2.1.0 # Apache-2.0
 pecan>=1.0.0,!=1.0.2,!=1.0.3,!=1.0.4,!=1.2 # BSD
 WSME>=0.10.1 # MIT
-eventlet>=0.26.0 # MIT
+eventlet>=0.27.0 # MIT
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.config>=1.1.0,!=4.3.0,!=4.4.0 # Apache-2.0
 oslo.log>=5.0.0 # Apache-2.0