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

Use the the new features of fail_if_missing for checkmode (#5750)

Browse source
This commit is contained in:
jctanner 2016-11-28 14:15:12 -05:00 committed by Matt Clay
parent d2fec9d259
commit d41b4e3802
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/modules/system/service.py
View file

@ -131,6 +131,7 @@ import select
import time import time
import string import string
import glob import glob
from ansible.module_utils.service import fail_if_missing
# The distutils module is not shipped with SUNWPython on Solaris. # The distutils module is not shipped with SUNWPython on Solaris.
# It's in the SUNWPython-devel package which also contains development files # It's in the SUNWPython-devel package which also contains development files
@ -493,7 +494,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:
self.module.fail_json(msg="no service or tool found for: %s" % self.name) fail_if_missing(self.module, False, self.name, msg='host')
# 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):

7
lib/ansible/modules/system/systemd.py
View file

@ -329,8 +329,7 @@ def main():
(rc, out, err) = module.run_command("%s %s '%s'" % (systemctl, action, unit)) (rc, out, err) = module.run_command("%s %s '%s'" % (systemctl, action, unit))
if rc != 0: if rc != 0:
# some versions of system CAN mask/unmask non existing services, we only fail on missing if they don't # some versions of system CAN mask/unmask non existing services, we only fail on missing if they don't
fail_if_missing(module, found, unit, "cannot %s" % (action)) fail_if_missing(module, found, unit, msg='host')
module.fail_json(msg="Unable to %s service %s: %s" % (action, unit, err))
# Enable/disable service startup at boot if requested # Enable/disable service startup at boot if requested
@ -341,7 +340,7 @@ def main():
else: else:
action = 'disable' action = 'disable'
fail_if_missing(module, found, unit, "cannot %s" % (action)) fail_if_missing(module, found, unit, msg='host')
# do we need to enable the service? # do we need to enable the service?
enabled = False enabled = False
@ -370,7 +369,7 @@ def main():
# set service state if requested # set service state if requested
if module.params['state'] is not None: if module.params['state'] is not None:
fail_if_missing(module, found, unit, "cannot check nor set state") fail_if_missing(module, found, unit, msg="host")
# default to desired state # default to desired state
result['state'] = module.params['state'] result['state'] = module.params['state']