Fix service module for issue 755 and another bug
Allow use of service module with just enable parameter, per issue #755. Also fixed two other issues: - fixed parameter to be 'enabled' per docs, not 'enable'. - fixed if block that checks whether to run _do_enable() to check whether the parameter is set, not the value of the enable value which may be None or False. If enabled=no, the service would never be disabled.
This commit is contained in:
parent
2d9ceafbd4
commit
42ad1c879f
1 changed files with 4 additions and 4 deletions
|
@ -132,14 +132,14 @@ def main():
|
||||||
module = AnsibleModule(
|
module = AnsibleModule(
|
||||||
argument_spec = dict(
|
argument_spec = dict(
|
||||||
name = dict(required=True),
|
name = dict(required=True),
|
||||||
state = dict(required=True, choices=['running', 'started', 'stopped', 'restarted', 'reloaded']),
|
state = dict(choices=['running', 'started', 'stopped', 'restarted', 'reloaded']),
|
||||||
enable = dict(choices=BOOLEANS)
|
enabled = dict(choices=BOOLEANS)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
name = module.params['name']
|
name = module.params['name']
|
||||||
state = module.params['state']
|
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
|
# find binaries locations on minion
|
||||||
|
@ -156,7 +156,7 @@ def main():
|
||||||
err = ''
|
err = ''
|
||||||
out = ''
|
out = ''
|
||||||
|
|
||||||
if enable:
|
if module.params['enabled']:
|
||||||
rc_enable, out_enable, err_enable = _do_enable(name, enable)
|
rc_enable, out_enable, err_enable = _do_enable(name, enable)
|
||||||
rc += rc_enable
|
rc += rc_enable
|
||||||
out += out_enable
|
out += out_enable
|
||||||
|
|
Loading…
Reference in a new issue