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

Adding ability in salt.modules.zpool.import to list available pools for import

Browse Source
This commit is contained in:
Nitin Madhok 2014-10-29 16:41:36 -04:00
parent 687a9bdfbc
commit 0f108988b8
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/modules/zpool.py
View File

@ -353,22 +353,29 @@ def export(pool_name='', force='false'):
def import_(pool_name='', force='false'):
'''
Import a storage pool
Import a storage pool or list pools available for import
CLI Example:
.. code-block:: bash
salt '*' zpool.import
salt '*' zpool.import myzpool [force=True|False]
'''
ret = {}
zpool = _check_zpool()
if not pool_name:
ret['Error'] = 'zpool name parameter is mandatory'
cmd = '{0} import'.format(zpool)
res = __salt__['cmd.run'](cmd, ignore_retcode=True)
if not res:
ret['Error'] = 'No pools available for import'
else:
pool_list = [l for l in res.splitlines()]
ret['pools'] = pool_list
return ret
if exists(pool_name):
ret['Error'] = 'Storage pool {0} already exists. Import the pool under a different name instead'.format(pool_name)
else:
zpool = _check_zpool()
if force is True:
cmd = '{0} import -f {1}'.format(zpool, pool_name)
else: