summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrahinja Kustudic <kustodian@gmail.com>2019-05-08 17:34:55 +0200
committerSam Doran <sdoran@redhat.com>2019-05-08 11:34:55 -0400
commita5b6a161b543966521af62a078e04df51c389437 (patch)
tree3f6d0d3bdad07dbba02c453e420279895e7e6ad1
parentcf585831b4fb80c4ae5c0f5b25583bdb7e31a14d (diff)
downloadansible-a5b6a161b543966521af62a078e04df51c389437.tar.gz
sysctl will now return an error if the value is invalid (#55695)
* sysctl will now return an error if the value is invalid sysctl can fail to set a value even if it returns an exit status 0. More details: https://bugzilla.redhat.com/show_bug.cgi?id=1264080. Because of this in case of an invalid value or a read-only file system, sysctl module would return OK, even though it didn't set anything. To be sure that sysctl correctly applied the changes we also need to check the output of stderr. * Run sysctl with LANG=C Because we are parsing sysctl stderr we need to make sure that errors are persistent across different system language settings. * Add changelog fragment for sysctl
-rw-r--r--changelogs/fragments/sysctl-invalid-value.yml2
-rw-r--r--lib/ansible/modules/system/sysctl.py25
-rw-r--r--test/integration/targets/sysctl/tasks/main.yml37
3 files changed, 58 insertions, 6 deletions
diff --git a/changelogs/fragments/sysctl-invalid-value.yml b/changelogs/fragments/sysctl-invalid-value.yml
new file mode 100644
index 0000000000..75ae5e790d
--- /dev/null
+++ b/changelogs/fragments/sysctl-invalid-value.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - "sysctl: the module now also checks the output of STDERR to report if values are correctly set (https://github.com/ansible/ansible/pull/55695)"
diff --git a/lib/ansible/modules/system/sysctl.py b/lib/ansible/modules/system/sysctl.py
index c6b732973b..521d7ab908 100644
--- a/lib/ansible/modules/system/sysctl.py
+++ b/lib/ansible/modules/system/sysctl.py
@@ -99,6 +99,7 @@ EXAMPLES = '''
# ==============================================================
import os
+import re
import tempfile
from ansible.module_utils.basic import get_platform, AnsibleModule
@@ -109,6 +110,10 @@ from ansible.module_utils._text import to_native
class SysctlModule(object):
+ # We have to use LANG=C because we are capturing STDERR of sysctl to detect
+ # success or failure.
+ LANG_ENV = {'LANG': 'C', 'LC_ALL': 'C', 'LC_MESSAGES': 'C'}
+
def __init__(self, module):
self.module = module
self.args = self.module.params
@@ -215,6 +220,14 @@ class SysctlModule(object):
else:
return value
+ def _stderr_failed(self, err):
+ # sysctl can fail to set a value even if it returns an exit status 0
+ # (https://bugzilla.redhat.com/show_bug.cgi?id=1264080). That's why we
+ # also have to check stderr for errors. For now we will only fail on
+ # specific errors defined by the regex below.
+ errors_regex = r'^sysctl: setting key "[^"]+": (Invalid argument|Read-only file system)$'
+ return re.search(errors_regex, err, re.MULTILINE) is not None
+
# ==============================================================
# SYSCTL COMMAND MANAGEMENT
# ==============================================================
@@ -226,7 +239,7 @@ class SysctlModule(object):
thiscmd = "%s -n %s" % (self.sysctl_cmd, token)
else:
thiscmd = "%s -e -n %s" % (self.sysctl_cmd, token)
- rc, out, err = self.module.run_command(thiscmd)
+ rc, out, err = self.module.run_command(thiscmd, environ_update=self.LANG_ENV)
if rc != 0:
return None
else:
@@ -250,8 +263,8 @@ class SysctlModule(object):
if self.args['ignoreerrors']:
ignore_missing = '-e'
thiscmd = "%s %s -w %s=%s" % (self.sysctl_cmd, ignore_missing, token, value)
- rc, out, err = self.module.run_command(thiscmd)
- if rc != 0:
+ rc, out, err = self.module.run_command(thiscmd, environ_update=self.LANG_ENV)
+ if rc != 0 or self._stderr_failed(err):
self.module.fail_json(msg='setting %s failed: %s' % (token, out + err))
else:
return rc
@@ -261,7 +274,7 @@ class SysctlModule(object):
# do it
if self.platform == 'freebsd':
# 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', environ_update=self.LANG_ENV)
elif self.platform == 'openbsd':
# openbsd doesn't support -p and doesn't have a sysctl service,
# so we have to set every value with its own sysctl call
@@ -279,9 +292,9 @@ class SysctlModule(object):
if self.args['ignoreerrors']:
sysctl_args.insert(1, '-e')
- rc, out, err = self.module.run_command(sysctl_args)
+ rc, out, err = self.module.run_command(sysctl_args, environ_update=self.LANG_ENV)
- if rc != 0:
+ if rc != 0 or self._stderr_failed(err):
self.module.fail_json(msg="Failed to reload sysctl: %s" % to_native(out) + to_native(err))
# ==============================================================
diff --git a/test/integration/targets/sysctl/tasks/main.yml b/test/integration/targets/sysctl/tasks/main.yml
index cdea4aa038..e23b2ccee6 100644
--- a/test/integration/targets/sysctl/tasks/main.yml
+++ b/test/integration/targets/sysctl/tasks/main.yml
@@ -16,6 +16,10 @@
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
+# NOTE: Testing sysctl inside an unprivileged container means that we cannot
+# apply sysctl, or it will always fail, because of that in most cases (except
+# those when it should fail) we have to use `reload=no`.
+
- set_fact:
output_dir_test: "{{ output_dir }}/test_sysctl"
@@ -115,6 +119,22 @@
that:
- sysctl_test2_change_test is not changed
+- name: Try sysctl with an invalid value
+ sysctl:
+ name: net.ipv4.ip_forward
+ value: foo
+ register: sysctl_test3
+ ignore_errors: yes
+
+- debug:
+ var: sysctl_test3
+ verbosity: 1
+
+- name: validate results for test 3
+ assert:
+ that:
+ - sysctl_test3 is failed
+
##
## sysctl - sysctl_set
##
@@ -171,3 +191,20 @@
that:
- sysctl_no_value is failed
- "sysctl_no_value.msg == 'value cannot be None'"
+
+- name: Try sysctl with an invalid value
+ sysctl:
+ name: net.ipv4.ip_forward
+ value: foo
+ sysctl_set: yes
+ register: sysctl_test4
+ ignore_errors: yes
+
+- debug:
+ var: sysctl_test4
+ verbosity: 1
+
+- name: validate results for test 4
+ assert:
+ that:
+ - sysctl_test4 is failed