From 2aba6e469c45445f68b74f696af7798716fcbd00 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 7 Aug 2018 15:31:41 -0400 Subject: [PATCH] Correct variable name in the 'connected' fix --- .../confluent/plugins/hardwaremanagement/ipmi.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 1f6276dc..0b8d5e31 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -271,19 +271,19 @@ class IpmiConsole(conapi.Console): iohandler=self.handle_data) self.solconnection.outputlock = NullLock() while (not self.solconnection.connected and - not (self.broken or self.solconnection.connected or + not (self.broken or self.solconnection.broken or self.solconnection.ipmi_session.broken)): w = eventlet.event.Event() _ipmiwaiters.append(w) w.wait(15) - if (self.broken or self.solconnection.connected or + if (self.broken or self.solconnection.broken or self.solconnection.ipmi_session.broken): + if not self.error: + self.error = 'Unknown error' if (self.error.startswith('Incorrect password') or self.error.startswith('Unauthorized name')): raise exc.TargetEndpointBadCredentials else: - if not self.error: - self.error = 'Unknown error' raise exc.TargetEndpointUnreachable(self.error) self.connected = True except socket.gaierror as err: