From df747539086e634ab49283fc95a47d920ecab920 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 22 Apr 2016 17:01:56 -0400 Subject: [PATCH] Patch import of pyghmi Now that the problematic use of an os pipe is no more, go ahead and patch pyghmi in a straightforward way. This was needed for the sake of pyghmi plugins that use a webclient. --- .../confluent/plugins/hardwaremanagement/ipmi.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 9ce05343..69cd3a1b 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -25,13 +25,10 @@ import eventlet.greenpool as greenpool import eventlet.queue as queue import pyghmi.constants as pygconstants import pyghmi.exceptions as pygexc -import pyghmi.ipmi.console as console -import pyghmi.ipmi.command as ipmicommand +console = eventlet.import_patched('pyghmi.ipmi.console') +ipmicommand = eventlet.import_patched('pyghmi.ipmi.command') import socket -console.session.select = eventlet.green.select -console.session.threading = eventlet.green.threading - def exithandler(): console.session.iothread.join()