wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved conflicts with mistaken commits in earlier history (#52953)

Browse source
This commit is contained in:
Xander Madsen 2019-03-01 05:11:46 -05:00 committed by John R Barker
parent fb4d0d84ec
commit 9f7eb8ee53
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/module_utils/redfish_utils.py
View file

@ -734,11 +734,10 @@ class RedfishUtils(object):
fan_results = [] fan_results = []
key = "Thermal" key = "Thermal"
# Get these entries, but does not fail if not found # Get these entries, but does not fail if not found
properties = ['FanName', 'Reading', 'Status'] properties = ['FanName', 'Reading', 'ReadingUnits', 'Status']
# Go through list # Go through list
for chassis_uri in self.chassis_uri_list: for chassis_uri in self.chassis_uri_list:
fan = {}
response = self.get_request(self.root_uri + chassis_uri) response = self.get_request(self.root_uri + chassis_uri)
if response['ret'] is False: if response['ret'] is False:
return response return response
@ -754,12 +753,12 @@ class RedfishUtils(object):
data = response['data'] data = response['data']
for device in data[u'Fans']: for device in data[u'Fans']:
fan = {}
for property in properties: for property in properties:
if property in device: if property in device:
fan[property] = device[property] fan[property] = device[property]
fan_results.append(fan) fan_results.append(fan)
result["entries"] = fan_results result["entries"] = fan_results
return result return result
def get_cpu_inventory(self): def get_cpu_inventory(self):