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

Merge pull request #2705 from bcoca/service_fail_whenmissing

Browse source 
service goes back to failing when absent
This commit is contained in:
Brian Coca 2015-12-17 13:04:28 -05:00
commit cd0f350b84
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
system/service.py
View file

@ -471,8 +471,7 @@ class LinuxService(Service):
self.enable_cmd = location['chkconfig'] self.enable_cmd = location['chkconfig']
if self.enable_cmd is None: if self.enable_cmd is None:
# exiting without change on non-existent service self.module.fail_json(msg="no service or tool found for: %s" % self.name)
self.module.exit_json(changed=False, exists=False)
# If no service control tool selected yet, try to see if 'service' is available # If no service control tool selected yet, try to see if 'service' is available
if self.svc_cmd is None and location.get('service', False): if self.svc_cmd is None and location.get('service', False):
@ -480,7 +479,7 @@ class LinuxService(Service):
# couldn't find anything yet # couldn't find anything yet
if self.svc_cmd is None and not self.svc_initscript: if self.svc_cmd is None and not self.svc_initscript:
self.module.exit_json(changed=False, exists=False) self.module.fail_json(msg='cannot find \'service\' binary or init script for service, possible typo in service name?, aborting')
if location.get('initctl', False): if location.get('initctl', False):
self.svc_initctl = location['initctl'] self.svc_initctl = location['initctl']