Merge pull request #37445 from twangboy/fix_import_error_2016.3

Check for Server os before checking [DO NOT MERGE FORWARD]
This commit is contained in:
Mike Place 2016-11-04 17:04:49 +13:00 committed by GitHub
commit afb1b3cee5

View file

@ -47,6 +47,9 @@ def _check_server_manager():
Returns: True if import is successful, otherwise returns False
'''
if 'Server' not in __grains__['osrelease']:
return False
return not __salt__['cmd.retcode']('Import-Module ServerManager',
shell='powershell',
python_shell=True)