From cf80f9b68b7a66a5bb261d39295be4a204e16ba0 Mon Sep 17 00:00:00 2001 From: Tom Dymond Date: Tue, 4 Feb 2014 18:19:28 +0000 Subject: [PATCH 1/2] Add option to enable the sysctl -e option --- library/system/sysctl | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/library/system/sysctl b/library/system/sysctl index 2e3ce767e22..d323f2dde73 100644 --- a/library/system/sysctl +++ b/library/system/sysctl @@ -45,6 +45,11 @@ options: - Whether the entry should be present or absent in the sysctl file. choices: [ "present", "absent" ] default: present + ignoreerrors: + description: + - Use this option to ignore errors about unknown keys. + choices: [ "yes", "no" ] + default: no reload: description: - 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 rc,out,err = self.module.run_command('/etc/rc.d/sysctl reload') else: - # 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]) + # system supports reloading via the -p flag to sysctl, so we'll use that + 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: 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']), reload = dict(default=True, type='bool'), sysctl_set = dict(default=False, type='bool'), + ignoreerrors = dict(default=False, type='bool'), sysctl_file = dict(default='/etc/sysctl.conf') ), supports_check_mode=True From 486d14cb2de4f911cc0e1a182541e671344e35e0 Mon Sep 17 00:00:00 2001 From: Tom Dymond Date: Wed, 5 Feb 2014 15:35:24 +0000 Subject: [PATCH 2/2] Reworked PR to avoid repeating the command --- library/system/sysctl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/library/system/sysctl b/library/system/sysctl index d323f2dde73..97e5bc5e6c1 100644 --- a/library/system/sysctl +++ b/library/system/sysctl @@ -220,10 +220,11 @@ class SysctlModule(object): rc,out,err = self.module.run_command('/etc/rc.d/sysctl reload') else: # system supports reloading via the -p flag to sysctl, so we'll use that + sysctl_args = [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]) + sysctl_args.insert(1, '-e') + + rc,out,err = self.module.run_command(sysctl_args) if rc != 0: self.module.fail_json(msg="Failed to reload sysctl: %s" % str(out) + str(err))