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

Merge pull request #2091 from davixx/sysctl2004

Browse source 
Solving bug : sysctl check_after failing on multi-value sysctl parameters
This commit is contained in:
Michael DeHaan 2013-02-16 10:19:16 -08:00
commit 018f756c9d
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sysctl
View file

@ -79,6 +79,7 @@ author: David "DaviXX" CHANIAL <david.chanial@gmail.com>
import os import os
import tempfile import tempfile
import re
# ============================================================== # ==============================================================
@ -185,13 +186,22 @@ def sysctl_check(current_step, **sysctl_args):
if current_step == 'after' and sysctl_args['checks'] in ['after', 'both']: if current_step == 'after' and sysctl_args['checks'] in ['after', 'both']:
if sysctl_args['value'] is not None: if sysctl_args['value'] is not None:
# reading the virtual file
f = open(sysctl_args['key_path'],'r') f = open(sysctl_args['key_path'],'r')
output = f.read() output = f.read()
f.close() f.close()
output = output.strip(' \t\n\r') output = output.strip(' \t\n\r')
# multi positive integer values separated by spaces as described in issue #2004 :
if re.search('^([\d\s]+)$', sysctl_args['value']):
# replace all groups of spaces by one space
output = re.sub('(\s+)', ' ', output)
# normal case, finded value must be equal to the submitted value :
if output != sysctl_args['value']: if output != sysctl_args['value']:
return 1, 'key seems not set to value even after update/sysctl, founded : <%s>, wanted : <%s>' % (output, sysctl_args['value']) return 1, 'key seems not set to value even after update/sysctl, founded : <%s>, wanted : <%s>' % (output, sysctl_args['value'])
return 0, '' return 0, ''
# weird end # weird end