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

Merge pull request #756 from sfromm/issue755

Browse source 
Issue755 - fixes for service module
This commit is contained in:
Michael DeHaan 2012-08-01 16:27:13 -07:00
commit 128a606a59
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
library/service
View file

@ -132,14 +132,14 @@ def main():
module = AnsibleModule(
argument_spec = dict(
name = dict(required=True),
state = dict(required=True, choices=['running', 'started', 'stopped', 'restarted', 'reloaded']),
enable = dict(choices=BOOLEANS)
state = dict(choices=['running', 'started', 'stopped', 'restarted', 'reloaded']),
enabled = dict(choices=BOOLEANS)
)
)
name = module.params['name']
state = module.params['state']
enable = module.boolean(module.params.get('enable', None))
enable = module.boolean(module.params.get('enabled', None))
# ===========================================
# find binaries locations on minion
@ -156,8 +156,10 @@ def main():
err = ''
out = ''
if enable:
if module.params['enabled']:
rc_enable, out_enable, err_enable = _do_enable(name, enable)
if rc == 0:
changed = True
rc += rc_enable
out += out_enable
err += err_enable
@ -201,6 +203,10 @@ def main():
module.fail_json(msg=err)
result = {"changed": changed}
if module.params['enabled']:
result['enabled'] = module.params['enabled']
if state:
result['state'] = state
rc, stdout, stderr = _run("%s %s status" % (SERVICE, name))
module.exit_json(**result);