saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #28867 from rallytime/fx2-grains-patch

Browse source 
[fx2 grains] Grains functions should return dictionaries
This commit is contained in:
C. R. Oldham 2015-11-13 14:14:13 -07:00
commit 430e9376f6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/grains/fx2.py
View file

@ -73,9 +73,9 @@ def location():
GRAINS_CACHE.update(_grains())
try:
return GRAINS_CACHE.get('Chassis Information').get('Chassis Location')
return {'location': GRAINS_CACHE.get('Chassis Information').get('Chassis Location')}
except AttributeError:
return "Unknown"
return {'location': 'Unknown'}
def os_family():