valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #47078 from sjorge/zfsgrainnopool

Browse Source 
Ignore return code in zfs grains
This commit is contained in:
Nicole Thomas 2018-04-17 16:50:21 -04:00 committed by GitHub
commit ab8b12379b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/grains/zfs.py
View File

@ -60,7 +60,7 @@ def _zfs_pool_data():
flags=['-H'], flags=['-H'],
opts={'-o': 'name,size'}, opts={'-o': 'name,size'},
) )
for zpool in __salt__['cmd.run'](zpool_list_cmd).splitlines(): for zpool in __salt__['cmd.run'](zpool_list_cmd, ignore_retcode=True).splitlines():
if 'zpool' not in grains: if 'zpool' not in grains:
grains['zpool'] = {} grains['zpool'] = {}
zpool = zpool.split() zpool = zpool.split()