xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-01-10 18:12:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix non-client fallback

Browse Source 
If client doesn't provide file,
then we need to open by name.
This commit is contained in:
Jarrod Johnson
2021-03-02 15:15:54 -05:00
parent e01a7cf4fb
commit 5ed0b50110
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
confluent_server/confluent/osimage.py
View File

@@ -597,7 +597,7 @@ class MediaImporter(object):
if cfm and media in cfm.clientfiles:
medfile = cfm.clientfiles[media]
else:
medfile = open(medfile, 'rb')
medfile = open(media, 'rb')
identity = fingerprint(medfile)
if not identity:
raise exc.InvalidArgumentException('Unsupported Media')

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

@@ -1528,7 +1528,7 @@ class IpmiHandler(object):
datfile = None
if filename in self.cfm.clientfiles:
cf = self.cfm.clientfiles[filename]
datfile = os.fdopen(os.dup(cf.filenoe()), cf.mode)
datfile = os.fdopen(os.dup(cf.fileno()), cf.mode)
if datfile is None and not os.access(filename, os.R_OK):
errstr = ('{0} is not readable by confluent on {1} '
'(ensure confluent user or group can access file '

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

@@ -1373,7 +1373,7 @@ class IpmiHandler(object):
datfile = None
if filename in self.cfm.clientfiles:
cf = self.cfm.clientfiles[filename]
datfile = os.fdopen(os.dup(cf.filenoe()), cf.mode)
datfile = os.fdopen(os.dup(cf.fileno()), cf.mode)
if datfile is None and not os.access(filename, os.R_OK):
errstr = ('{0} is not readable by confluent on {1} '
'(ensure confluent user or group can access file '