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

Allow adding additional arguments to service module

Browse source 
Some services allow additional arguments to be provided on the command line. This patch makes it possible.
This commit is contained in:
Dag Wieers 2012-11-15 18:31:40 +01:00
parent 0ab3bd0034
commit 3852b9918a
1 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
library/service
View file

@ -52,17 +52,23 @@ options:
choices: [ "yes", "no" ] choices: [ "yes", "no" ]
description: description:
- Whether the service should start on boot. - Whether the service should start on boot.
arguments:
description:
- Additional arguments provided on the command line
aliases: [ 'args' ]
examples: examples:
- code: "service: name=httpd state=started" - description: Example action to start service httpd, if not running
description: Example action from Ansible Playbooks code: "service: name=httpd state=started"
- code: "service: name=httpd state=stopped" - description: Example action to stop service httpd, if running
description: Example action from Ansible Playbooks code: "service: name=httpd state=stopped"
- code: "service: name=httpd state=restarted" - description: Example action to restart service httpd, in all cases
description: Example action from Ansible Playbooks code: "service: name=httpd state=restarted"
- code: "service: name=httpd state=reloaded" - description: Example action to reload service httpd, in all cases
description: Example action from Ansible Playbooks code: "service: name=httpd state=reloaded"
- code: "service: name=foo pattern=/usr/bin/foo state=started" - description: Example action to start service foo, based on running process /usr/bin/foo
description: Example action from Ansible Playbooks code: "service: name=foo pattern=/usr/bin/foo state=started"
- description: Example action to restart network service for interface eth0
code: "service: name=network state=restarted args=eth0"
''' '''
import platform import platform
@ -123,8 +129,8 @@ def _find_binaries(m,name):
else: else:
INITCTL = None INITCTL = None
def _get_service_status(name, pattern): def _get_service_status(name, pattern, arguments):
rc, status_stdout, status_stderr = _run("%s %s status" % (SERVICE, name)) rc, status_stdout, status_stderr = _run("%s %s status %s" % (SERVICE, name, arguments))
# set the running state to None because we don't know it yet # set the running state to None because we don't know it yet
running = None running = None
@ -258,7 +264,8 @@ def main():
name = dict(required=True), name = dict(required=True),
state = dict(choices=['running', 'started', 'stopped', 'restarted', 'reloaded']), state = dict(choices=['running', 'started', 'stopped', 'restarted', 'reloaded']),
pattern = dict(required=False, default=None), pattern = dict(required=False, default=None),
enabled = dict(choices=BOOLEANS) enabled = dict(choices=BOOLEANS),
arguments = dict(aliases=['args']),
) )
) )
@ -266,6 +273,7 @@ def main():
state = module.params['state'] state = module.params['state']
pattern = module.params['pattern'] pattern = module.params['pattern']
enable = module.boolean(module.params.get('enabled', None)) enable = module.boolean(module.params.get('enabled', None))
arguments = module.params.get('arguments', '')
# Set PS options here if 'ps auxww' will not work on # Set PS options here if 'ps auxww' will not work on
# target platform # target platform
@ -279,7 +287,7 @@ def main():
# =========================================== # ===========================================
# get service status # get service status
running = _get_service_status(name, pattern) running = _get_service_status(name, pattern, arguments)
# =========================================== # ===========================================
# Some common variables # Some common variables
@ -329,14 +337,14 @@ def main():
reload = "reload" reload = "reload"
if state in ['started', 'running']: if state in ['started', 'running']:
rc_state, stdout, stderr = _run("%s %s" % (svc_cmd,start)) rc_state, stdout, stderr = _run("%s %s %s" % (svc_cmd, start, arguments))
elif state == 'stopped': elif state == 'stopped':
rc_state, stdout, stderr = _run("%s %s" % (svc_cmd,stop)) rc_state, stdout, stderr = _run("%s %s %s" % (svc_cmd, stop, arguments))
elif state == 'reloaded': elif state == 'reloaded':
rc_state, stdout, stderr = _run("%s %s" % (svc_cmd,reload)) rc_state, stdout, stderr = _run("%s %s %s" % (svc_cmd, reload, arguments))
elif state == 'restarted': elif state == 'restarted':
rc1, stdout1, stderr1 = _run("%s %s" % (svc_cmd,stop)) rc1, stdout1, stderr1 = _run("%s %s %s" % (svc_cmd, stop, arguments))
rc2, stdout2, stderr2 = _run("%s %s" % (svc_cmd,start)) rc2, stdout2, stderr2 = _run("%s %s %s" % (svc_cmd, start, arguments))
if rc1 != 0 and rc2 == 0: if rc1 != 0 and rc2 == 0:
rc_state = rc + rc2 rc_state = rc + rc2
stdout = stdout2 stdout = stdout2
@ -359,7 +367,7 @@ def main():
if state: if state:
result['state'] = state result['state'] = state
rc, stdout, stderr = _run("%s status" % (svc_cmd)) rc, stdout, stderr = _run("%s status %s" % (svc_cmd, arguments))
module.exit_json(**result) module.exit_json(**result)
# this is magic, see lib/ansible/module_common.py # this is magic, see lib/ansible/module_common.py