xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-08-27 21:40:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into ansibleplay

Browse Source
This commit is contained in:
Jarrod Johnson
2021-03-16 10:46:54 -04:00
parent 309ea00f10 5a81279b9d
commit f2cb6ea535
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
View File

@@ -603,7 +603,7 @@ class IpmiHandler(object):
self.output.put(msg.CreatedResource(
'nodes/{0}/media/uploads/{1}'.format(self.node, u.name)))
def get_diags(self, savefile, progress):
def get_diags(self, savefile, progress, data=None):
return self.ipmicmd.get_diagnostic_data(
savefile, progress=progress, autosuffix=True)

2
confluent_server/confluent/plugins/hardwaremanagement/redfish.py
View File

@@ -468,7 +468,7 @@ class IpmiHandler(object):
self.output.put(msg.CreatedResource(
'nodes/{0}/media/uploads/{1}'.format(self.node, u.name)))
def get_diags(self, savefile, progress):
def get_diags(self, savefile, progress, data=None):
return self.ipmicmd.get_diagnostic_data(
savefile, progress=progress, autosuffix=True)