ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 14:20:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert "added innitial daemon-reloaded support to service module"

Browse source 
This reverts commit 438d87d26991c26de4a6b1457b154eb8f50d093a.
This commit is contained in:
Brian Coca 2015-06-10 12:53:34 -04:00 • committed by Matt Clay
commit b2dadaadf8
1 changed files with 52 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,13 +34,12 @@ options:
- Name of the service. - Name of the service.
state: state:
required: false required: false
choices: [ started, stopped, restarted, reloaded, daemon_reloaded ] choices: [ started, stopped, restarted, reloaded ]
description: description:
- C(started)/C(stopped) are idempotent actions that will not run - C(started)/C(stopped) are idempotent actions that will not run
commands unless necessary. C(restarted) will always bounce the commands unless necessary. C(restarted) will always bounce the
service. C(reloaded) will always reload. B(At least one of state service. C(reloaded) will always reload. B(At least one of state
and enabled are required.) and enabled are required.)
- The C(daemon_reloaded) state was added in 2.0, it is exclusive for systemd.
sleep: sleep:
required: false required: false
version_added: "1.3" version_added: "1.3"
@ -280,7 +279,7 @@ class Service(object):
# Find ps binary # Find ps binary
psbin = self.module.get_bin_path('ps', True) psbin = self.module.get_bin_path('ps', True)
(rc, psout, pserr) = execute_command('%s %s' % (psbin, psflags)) (rc, psout, pserr) = self.execute_command('%s %s' % (psbin, psflags))
# If rc is 0, set running as appropriate # If rc is 0, set running as appropriate
if rc == 0: if rc == 0:
self.running = False self.running = False
@ -1414,7 +1413,7 @@ def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
name = dict(required=True), name = dict(required=True),
state = dict(choices=['running', 'started', 'stopped', 'restarted', 'reloaded', 'daemon_reloaded']), state = dict(choices=['running', 'started', 'stopped', 'restarted', 'reloaded']),
sleep = dict(required=False, type='int', default=None), sleep = dict(required=False, type='int', default=None),
pattern = dict(required=False, default=None), pattern = dict(required=False, default=None),
enabled = dict(type='bool'), enabled = dict(type='bool'),
@ -1441,21 +1440,6 @@ def main():
result = {} result = {}
result['name'] = service.name result['name'] = service.name
# shortcut for systemd only daemon-reloaded
if module.params['state'] == 'daemon_reloaded':
cmd = module.get_bin_path('systemctl', True)
svc_cmd = "%s %s %s" % (cmd, service.name, 'daemon-reloaded')
rc, stdout, stderr = module.run_command(svc_cmd)
result['msg']=stdout
if rc != 0:
result['rc'] = rc
if stderr:
result['msg']=stderr
module.fail_json(**result)
result['changed']=True
else:
# Find service management tools # Find service management tools
service.get_service_tools() service.get_service_tools()