From 5ddc97603abfc6b154029b199e22064852918630 Mon Sep 17 00:00:00 2001
From: Jarrod Johnon <jjohnson2@lenovo.com>
Date: Mon, 19 Jan 2015 16:22:22 -0500
Subject: [PATCH] Fix trace on unresolvable manager in ipmi

If hardwaremanagement.manager did not resolve, a trace
was generated.  Fix by properly indicating the endpoint
was unreachable.
---
 .../confluent/plugins/hardwaremanagement/ipmi.py   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
index d48de672..fb9878cf 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
@@ -250,11 +250,15 @@ class IpmiHandler(object):
         if ((node, tenant) not in persistent_ipmicmds or
                 not persistent_ipmicmds[(node, tenant)].ipmi_session.logged):
             self._logevt = threading.Event()
-            persistent_ipmicmds[(node, tenant)] = IpmiCommandWrapper(
-                node, cfg, bmc=connparams['bmc'],
-                userid=connparams['username'],
-                password=connparams['passphrase'], kg=connparams['kg'],
-                port=connparams['port'], onlogon=self.logged)
+            try:
+                persistent_ipmicmds[(node, tenant)] = IpmiCommandWrapper(
+                    node, cfg, bmc=connparams['bmc'],
+                    userid=connparams['username'],
+                    password=connparams['passphrase'], kg=connparams['kg'],
+                    port=connparams['port'], onlogon=self.logged)
+            except socket.gaierror as ge:
+                if ge[0] == -2:
+                    raise exc.TargetEndpointUnreachable(ge[1])
         self.ipmicmd = persistent_ipmicmds[(node, tenant)]
 
     bootdevices = {