Merge pull request #2340 from niksite/devel

Fixed 'service'. Now it respect 'enabled=no' as well.
This commit is contained in:
Michael DeHaan 2013-03-07 21:11:25 -08:00
commit c4aa72f1fd

View file

@ -743,7 +743,7 @@ def main():
service.get_service_tools()
# Enable/disable service startup at boot if requested
if service.module.params['enabled']:
if service.module.params['enabled'] is not None:
# FIXME: ideally this should detect if we need to toggle the enablement state, though
# it's unlikely the changed handler would need to fire in this case so it's a minor thing.
service.service_enable()
@ -766,7 +766,7 @@ def main():
module.fail_json(msg=out)
result['changed'] = service.changed
if service.module.params['enabled']:
if service.module.params['enabled'] is not None:
result['enabled'] = service.module.params['enabled']
if not service.module.params['state']: