Skip to content

Commit

Permalink
Don't set the domain grain to windowsdomain
Browse files Browse the repository at this point in the history
  • Loading branch information
twangboy committed Mar 20, 2019
1 parent 65eb461 commit c874831
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions salt/grains/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1247,8 +1247,6 @@ def _windows_platform_data():
elif 'OpenStack' in systeminfo.Model:
grains['virtual'] = 'OpenStack'

grains['domain'] = grains['windowsdomain']

return grains


Expand Down
2 changes: 0 additions & 2 deletions tests/unit/grains/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ def test__windows_platform_data(self):
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):
'''
Expand Down

0 comments on commit c874831

Please sign in to comment.