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 #34910 from cachedout/proxy_grains

Browse source 
Fix grains error on proxy minions
This commit is contained in:
Mike Place 2016-07-22 17:05:46 -06:00 • committed by GitHub
commit c663c8bb5b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/grains/core.py
View file

@ -1143,6 +1143,7 @@ def os_data():
grains['osrelease'] = 'proxy'
grains['os'] = 'proxy'
grains['os_family'] = 'proxy'
grains['osfullname'] = 'proxy'
elif salt.utils.is_windows():
with salt.utils.winapi.Com():
wmi_c = wmi.WMI()