Merge pull request saltstack#51892 from twangboy/gate_zfs

Gate zfs grain on Windows
DSRCorporation · Feb 28, 2019 · 1fa2072 · 1fa2072
2 parents 89b0991 + fbc2c0c
commit 1fa2072
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/salt/grains/zfs.py b/salt/grains/zfs.py
@@ -45,6 +45,9 @@ def __virtual__():
     '''
     # NOTE: we always load this grain so we can properly export
     #       at least the zfs_support grain
+    #       except for Windows... don't try to load this on Windows (#51703)
+    if salt.utils.platform.is_windows():
+        return False, 'ZFS: Not available on Windows'
     return __virtualname__