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

Merge pull request #10491 from gtmanfred/glusterfs

Browse Source 
Clean up lint changes
This commit is contained in:
Pedro Algarvio 2014-02-16 18:12:33 +00:00
commit 2cd772cf59
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/glusterfs.py
View File

@ -39,7 +39,7 @@ def list_peers():
return __salt__['cmd.run'](get_peer_list).splitlines()
def peer(name=None, **kwargs):
def peer(name):
'''
Add another node into the peer probe.
@ -54,7 +54,7 @@ def peer(name=None, **kwargs):
salt 'one.gluster.*' glusterfs.peer two
'''
if not suc.check_name(name, 'a-zA-Z0-9._-'):
if suc.check_name(name, 'a-zA-Z0-9._-'):
return 'Invalid characters in peer name'
hosts_file = __salt__['hosts.list_hosts']()
hosts_list = []
@ -117,17 +117,17 @@ def create(name,
if not os.path.exists(brick):
return 'Brick path doesn\'t exist.'
if not suc.check_name(name, 'a-zA-Z0-9._-'):
if suc.check_name(name, 'a-zA-Z0-9._-'):
return 'Invalid characters in volume name'
if not all([suc.check_name(peer, 'a-zA-Z0-9._-') for act_peer in peers]):
if any([suc.check_name(act_peer, 'a-zA-Z0-9._-') for act_peer in peers]):
return 'Invalid characters in a peer name.'
cmd = 'gluster volume create {0} '.format(name)
if replica:
cmd += 'replica {0} '.format(count)
for act_peer in peers:
cmd += '{0}:{1} '.format(peer, brick)
cmd += '{0}:{1} '.format(act_peer, brick)
log.debug('Clustering command:\n{0}'.format(cmd))
ret = __salt__['cmd.run'](cmd)

8
salt/states/glusterfs.py
View File

@ -56,7 +56,7 @@ def peered(name):
ret['result'] = None
return ret
if not suc.check_name(name, 'a-zA-Z0-9._-'):
if suc.check_name(name, 'a-zA-Z0-9._-'):
ret['comment'] = 'Invalid characters in peer name.'
ret['result'] = False
return ret
@ -110,12 +110,12 @@ def created(name, peers=None, **kwargs):
ret['result'] = None
return ret
if not suc.check_name(name, 'a-zA-Z0-9._-'):
if suc.check_name(name, 'a-zA-Z0-9._-'):
ret['comment'] = 'Invalid characters in volume name.'
ret['result'] = False
return ret
if not all([suc.check_name(peer, 'a-zA-Z0-9._-') for peer in peers]):
if any([suc.check_name(peer, 'a-zA-Z0-9._-') for peer in peers]):
ret['comment'] = 'Invalid characters in a peer name.'
ret['result'] = False
return ret
@ -149,7 +149,7 @@ def started(name, **kwargs):
ret['comment'] = 'Volume {0} does not exist'.format(name)
return ret
if not suc.check_name(name, 'a-zA-Z0-9._-'):
if suc.check_name(name, 'a-zA-Z0-9._-'):
ret['comment'] = 'Invalid characters in volume name.'
ret['result'] = False
return ret