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

Update blockdev state to use disk execution module instead of blockdev

Browse Source 
The blockdev execution module has been deprecated and marked for removal.
This commit is contained in:
rallytime 2016-08-16 13:31:33 -06:00
parent e8a6eb87f1
commit ba5ec14e93
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/states/blockdev.py
View File

@ -40,12 +40,12 @@ log = logging.getLogger(__name__)
def __virtual__():
'''
Only load this module if the blockdev execution module is available
Only load this module if the disk execution module is available
'''
if 'blockdev.tune' in __salt__:
if 'disk.tune' in __salt__:
return __virtualname__
return (False, ('Cannot load the {0} state module: '
'blockdev execution module not found'.format(__virtualname__)))
'disk execution module not found'.format(__virtualname__)))
def tuned(name, **kwargs):
@ -87,8 +87,8 @@ def tuned(name, **kwargs):
ret['result'] = None
return ret
else:
current = __salt__['blockdev.dump'](name)
changes = __salt__['blockdev.tune'](name, **kwargs)
current = __salt__['disk.dump'](name)
changes = __salt__['disk.tune'](name, **kwargs)
changeset = {}
for key in kwargs:
if key in kwarg_map:
@ -159,8 +159,8 @@ def formatted(name, fs_type='ext4', force=False, **kwargs):
ret['result'] = None
return ret
__salt__['blockdev.format'](name, fs_type, force=force, **kwargs)
current_fs = __salt__['blockdev.fstype'](name)
__salt__['disk.format_'](name, fs_type, force=force, **kwargs)
current_fs = __salt__['disk.fstype'](name)
# Repeat lsblk check up to 10 times with 3s sleeping between each
# to avoid lsblk failing although mkfs has succeeded