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

Don't set the domain grain to windowsdomain

Browse source
This commit is contained in:
twangboy 2019-03-20 08:52:21 -06:00
parent 65eb461071
commit c874831ef4
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/grains/core.py
View file

@ -1247,8 +1247,6 @@ def _windows_platform_data():
elif 'OpenStack' in systeminfo.Model:
grains['virtual'] = 'OpenStack'
grains['domain'] = grains['windowsdomain']
return grains

2
tests/unit/grains/test_core.py
View file

@ -155,8 +155,6 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
for key in keys:
self.assertIn(key, grains)
self.assertEqual(grains['domain'], grains['windowsdomain'])
@skipIf(not salt.utils.platform.is_linux(), 'System is not Linux')
def test_gnu_slash_linux_in_os_name(self):
'''