From 6aec9534e787b161fb0b3ce3050fbf970881942f Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 23 Aug 2018 16:56:40 -0400 Subject: [PATCH] Fixes for nodesupport --- confluent_client/bin/nodesupport | 4 ++-- confluent_server/confluent/plugins/hardwaremanagement/ipmi.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/confluent_client/bin/nodesupport b/confluent_client/bin/nodesupport index fedfa5c9..0075cf6a 100644 --- a/confluent_client/bin/nodesupport +++ b/confluent_client/bin/nodesupport @@ -31,7 +31,7 @@ if path.startswith('/opt'): sys.path.append(path) import confluent.client as client -import confluent.screensqueeze as sj q +import confluent.screensqueeze as sq exitcode = 0 @@ -69,7 +69,7 @@ def download_servicedata(noderange, media): session = client.Command() output = sq.ScreenPrinter(noderange, session) filename = os.path.abspath(media) - resource = '/noderange/{0}/media/uploads/'.format(noderange) + resource = '/noderange/{0}/support/servicedata/'.format(noderange) upargs = {'filename': filename} noderrs = {} nodeurls = {} diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index cb97e832..a7cf3c13 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -385,7 +385,7 @@ class IpmiHandler(object): self.error = None eventlet.sleep(0) self.cfg = cfd[node] - self.current_user = cfd.current_user + self.current_user = cfg.current_user self.loggedin = False self.node = node self.element = element