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

Add option to enable the sysctl -e option

Browse source
This commit is contained in:
Tom Dymond 2014-02-04 18:19:28 +00:00
parent e0429a4004
commit cf80f9b68b
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/system/sysctl
View file

@ -45,6 +45,11 @@ options:
- Whether the entry should be present or absent in the sysctl file. - Whether the entry should be present or absent in the sysctl file.
choices: [ "present", "absent" ] choices: [ "present", "absent" ]
default: present default: present
ignoreerrors:
description:
- Use this option to ignore errors about unknown keys.
choices: [ "yes", "no" ]
default: no
reload: reload:
description: description:
- If C(yes), performs a I(/sbin/sysctl -p) if the C(sysctl_file) is - If C(yes), performs a I(/sbin/sysctl -p) if the C(sysctl_file) is
@ -214,8 +219,11 @@ class SysctlModule(object):
# freebsd doesn't support -p, so reload the sysctl service # freebsd doesn't support -p, so reload the sysctl service
rc,out,err = self.module.run_command('/etc/rc.d/sysctl reload') rc,out,err = self.module.run_command('/etc/rc.d/sysctl reload')
else: else:
# system supports reloading via the -p flag to sysctl, so we'll use that # system supports reloading via the -p flag to sysctl, so we'll use that
rc,out,err = self.module.run_command([self.sysctl_cmd, '-p', self.sysctl_file]) if self.args['ignoreerrors']:
rc,out,err = self.module.run_command([self.sysctl_cmd, '-e', '-p', self.sysctl_file])
else:
rc,out,err = self.module.run_command([self.sysctl_cmd, '-p', self.sysctl_file])
if rc != 0: if rc != 0:
self.module.fail_json(msg="Failed to reload sysctl: %s" % str(out) + str(err)) self.module.fail_json(msg="Failed to reload sysctl: %s" % str(out) + str(err))
@ -296,6 +304,7 @@ def main():
state = dict(default='present', choices=['present', 'absent']), state = dict(default='present', choices=['present', 'absent']),
reload = dict(default=True, type='bool'), reload = dict(default=True, type='bool'),
sysctl_set = dict(default=False, type='bool'), sysctl_set = dict(default=False, type='bool'),
ignoreerrors = dict(default=False, type='bool'),
sysctl_file = dict(default='/etc/sysctl.conf') sysctl_file = dict(default='/etc/sysctl.conf')
), ),
supports_check_mode=True supports_check_mode=True