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

Merge pull request #19437 from jfindlay/split_zpool

Browse Source 
Split zpool commands
This commit is contained in:
Thomas S Hatch 2015-01-07 10:15:12 -07:00
commit b86cc4a5db
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
salt/modules/zpool.py
View File

@ -47,10 +47,11 @@ def status(name=''):
.. code-block:: bash
salt '*' zpool.status
salt '*' zpool.status myzpool
'''
zpool = _check_zpool()
res = __salt__['cmd.run']('{0} status {1}'.format(zpool, name))
cmd = [zpool, 'status', name]
res = __salt__['cmd.run'](cmd, python_shell=False)
ret = res.splitlines()
return ret
@ -63,10 +64,11 @@ def iostat(name=''):
.. code-block:: bash
salt '*' zpool.iostat
salt '*' zpool.iostat myzpool
'''
zpool = _check_zpool()
res = __salt__['cmd.run']('{0} iostat -v {1}'.format(zpool, name))
cmd = [zpool, 'iostat', '-v', name]
res = __salt__['cmd.run'](cmd, python_shell=False)
ret = res.splitlines()
return ret
@ -82,7 +84,8 @@ def zpool_list():
salt '*' zpool.zpool_list
'''
zpool = _check_zpool()
res = __salt__['cmd.run']('{0} list'.format(zpool))
cmd = [zpool, 'list']
res = __salt__['cmd.run'](cmd, python_shell=False)
pool_list = [l for l in res.splitlines()]
return {'pools': pool_list}
@ -117,8 +120,8 @@ def destroy(pool_name):
ret = {}
if exists(pool_name):
zpool = _check_zpool()
cmd = '{0} destroy {1}'.format(zpool, pool_name)
__salt__['cmd.run'](cmd)
cmd = [zpool, 'destroy', pool_name]
__salt__['cmd.run'](cmd, python_shell=False)
if not exists(pool_name):
ret[pool_name] = "Deleted"
return ret
@ -142,8 +145,8 @@ def scrub(pool_name=None):
return ret
if exists(pool_name):
zpool = _check_zpool()
cmd = '{0} scrub {1}'.format(zpool, pool_name)
res = __salt__['cmd.run'](cmd)
cmd = [zpool, 'scrub', pool_name]
res = __salt__['cmd.run'](cmd, python_shell=False)
ret[pool_name] = res.splitlines()
return ret
else:
@ -177,12 +180,12 @@ def create(pool_name, *vdevs):
else:
dlist.append(vdev)
devs = ' '.join(dlist)
zpool = _check_zpool()
cmd = '{0} create {1} {2}'.format(zpool, pool_name, devs)
cmd = [zpool, 'create', pool_name]
cmd.extend(dlist)
# Create storage pool
__salt__['cmd.run'](cmd)
__salt__['cmd.run'](cmd, python_shell=False)
# Check and see if the pools is available
if exists(pool_name):
@ -219,8 +222,8 @@ def add(pool_name, vdev):
# try and add watch out for mismatched replication levels
zpool = _check_zpool()
cmd = '{0} add {1} {2}'.format(zpool, pool_name, vdev)
res = __salt__['cmd.run'](cmd)
cmd = [zpool, 'add', pool_name, vdev]
res = __salt__['cmd.run'](cmd, python_shell=False)
if 'errors' not in res.splitlines():
ret['Added'] = '{0} to {1}'.format(vdev, pool_name)
return ret
@ -253,8 +256,8 @@ def replace(pool_name, old, new):
# Replace vdevs
zpool = _check_zpool()
cmd = '{0} replace {1} {2} {3}'.format(zpool, pool_name, old, new)
__salt__['cmd.run'](cmd)
cmd = [zpool, 'replace', pool_name, old, new]
__salt__['cmd.run'](cmd, python_shell=False)
# check for new vdev in pool
res = status(name=pool_name)
@ -262,7 +265,7 @@ def replace(pool_name, old, new):
if new in line:
ret['replaced'] = '{0} with {1}'.format(old, new)
return ret
ret['Error'] = 'Does not look like devices where swapped check status'
ret['Error'] = 'Does not look like devices were swapped; check status'
return ret
@ -292,10 +295,10 @@ def create_file_vdev(size, *vdevs):
else:
dlist.append(vdev)
devs = ' '.join(dlist)
mkfile = _check_mkfile()
cmd = '{0} {1} {2}'.format(mkfile, size, devs)
__salt__['cmd.run'](cmd)
cmd = [mkfile, '{0}'.format(size)]
cmd.extend(dlist)
__salt__['cmd.run'](cmd, python_shell=False)
# Makesure the files are there
for vdev in vdevs: