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

Merge branch 'service-enable-fix' of https://github.com/gottwald/ansible into gottwald-service-enable-fix

Browse source
This commit is contained in:
James Cammarata 2013-09-19 14:59:53 -05:00
commit f62093da56
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/system/service
View file

@ -144,6 +144,7 @@ class Service(object):
self.rcconf_file = None
self.rcconf_key = None
self.rcconf_value = None
self.svc_change = False
# select whether we dump additional debug info through syslog
self.syslogging = False
@ -271,18 +272,18 @@ class Service(object):
self.module.fail_json(msg="failed determining service state, possible typo of service name?")
# Find out if state has changed
if not self.running and self.state in ["started", "running"]:
self.changed = True
self.svc_change = True
elif self.running and self.state in ["stopped","reloaded"]:
self.changed = True
self.svc_change = True
elif self.state == "restarted":
self.changed = True
if self.module.check_mode and self.changed:
self.svc_change = True
if self.module.check_mode and self.svc_change:
self.module.exit_json(changed=True, msg='service state changed')
def modify_service_state(self):
# Only do something if state will change
if self.changed:
if self.svc_change:
# Control service
if self.state in ['started', 'running']:
self.action = "start"
@ -1133,6 +1134,8 @@ def main():
else:
module.fail_json(msg=out)
if service.svc_change is True:
service.changed = True
result['changed'] = service.changed
if service.module.params['enabled'] is not None:
result['enabled'] = service.module.params['enabled']