cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make 'module' global. Small whitespace formatting fixes. Closes Issue #397.

Browse source
This commit is contained in:
RJ Nowling 2015-04-14 12:02:32 -05:00
parent 9b5821f5f7
commit 582da5b911
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
system/gluster_volume.py
View file

@ -134,6 +134,7 @@ glusterbin = ''
def run_gluster(gargs, **kwargs): def run_gluster(gargs, **kwargs):
global glusterbin global glusterbin
global module
args = [glusterbin] args = [glusterbin]
args.extend(gargs) args.extend(gargs)
try: try:
@ -146,6 +147,7 @@ def run_gluster(gargs, **kwargs):
def run_gluster_nofail(gargs, **kwargs): def run_gluster_nofail(gargs, **kwargs):
global glusterbin global glusterbin
global module
args = [glusterbin] args = [glusterbin]
args.extend(gargs) args.extend(gargs)
rc, out, err = module.run_command(args, **kwargs) rc, out, err = module.run_command(args, **kwargs)
@ -155,6 +157,7 @@ def run_gluster_nofail(gargs, **kwargs):
def run_gluster_yes(gargs): def run_gluster_yes(gargs):
global glusterbin global glusterbin
global module
args = [glusterbin] args = [glusterbin]
args.extend(gargs) args.extend(gargs)
rc, out, err = module.run_command(args, data='y\n') rc, out, err = module.run_command(args, data='y\n')
@ -240,6 +243,7 @@ def wait_for_peer(host):
return False return False
def probe(host): def probe(host):
global module
run_gluster([ 'peer', 'probe', host ]) run_gluster([ 'peer', 'probe', host ])
if not wait_for_peer(host): if not wait_for_peer(host):
module.fail_json(msg='failed to probe peer %s' % host) module.fail_json(msg='failed to probe peer %s' % host)
@ -285,18 +289,19 @@ def add_brick(name, brick, force):
run_gluster(args) run_gluster(args)
def do_rebalance(name): def do_rebalance(name):
run_gluster(['volume', 'rebalance', name, 'start']) run_gluster([ 'volume', 'rebalance', name, 'start' ])
def enable_quota(name): def enable_quota(name):
run_gluster([ 'volume', 'quota', name, 'enable' ]) run_gluster([ 'volume', 'quota', name, 'enable' ])
def set_quota(name, directory, value): def set_quota(name, directory, value):
run_gluster([ 'volume', 'quota', name, 'limit-usage', directory, value ]) run_gluster([ 'volume', 'quota', name, 'limit-usage', directory, value ])
def main(): def main():
### MAIN ### ### MAIN ###
global module
module = AnsibleModule( module = AnsibleModule(
argument_spec=dict( argument_spec=dict(
name=dict(required=True, default=None, aliases=['volume']), name=dict(required=True, default=None, aliases=['volume']),