valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert commit fb763d

Browse Source 
This commit completely breaks the salt-master on all non-Linux systems:

fb763d91e8

Why?

_hw_data(osdata) is called before `osdata` includes the key 'kernel', resulting
in a KeyError.  Steps to reproduce:

(saltenv) $ salt-master -l debug
This commit is contained in:
Eric Radman 2016-11-11 16:16:31 -05:00
parent f7f7b987b3
commit a3bf714c74
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/grains/core.py
View File

@ -484,7 +484,6 @@ def _virtual(osdata):
# virtual
# virtual_subtype
grains = {'virtual': 'physical'}
grains.update(_hw_data(grains))
# Skip the below loop on platforms which have none of the desired cmds
# This is a temporary measure until we can write proper virtual hardware