a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2145 from leucos/sysctl_no_file_check 

Better sysctl module file check
pull/4420/head
Michael DeHaan 2013-02-23 09:14:45 -08:00
parent 274f15b52c e0496634c5
commit 467556708a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/sysctl
View File

@ -155,15 +155,6 @@ def sysctl_check(current_step, **sysctl_args):
if not os.access(sysctl_args['key_path'], os.R_OK): if not os.access(sysctl_args['key_path'], os.R_OK):
return 1, 'key_path is not a readable file, key seems to be uncheckable' return 1, 'key_path is not a readable file, key seems to be uncheckable'
# sysctl file exists and openable ?
# TODO choose if prefered to use os.access() instead try/catch on open
if current_step == 'before':
try:
f = open(sysctl_args['sysctl_file'])
f.close()
except IOError, e:
return 1, 'unable to open supplied sysctl.conf'
# no smart checks at this step ? # no smart checks at this step ?
if sysctl_args['checks'] == 'none': if sysctl_args['checks'] == 'none':
return 0, '' return 0, ''
@ -244,6 +235,13 @@ def main():
if res != 0: if res != 0:
module.fail_json(msg='checks_before failed with: ' + msg) module.fail_json(msg='checks_before failed with: ' + msg)
if not os.access(sysctl_args['sysctl_file'], os.W_OK):
try:
f = open(sysctl_args['sysctl_file'],'w')
f.close()
except IOError, e:
module.fail_json(msg='unable to create supplied sysctl file (destination directory probably missing)')
# reading the file # reading the file
for line in open(sysctl_args['sysctl_file'], 'r').readlines(): for line in open(sysctl_args['sysctl_file'], 'r').readlines():
if not line.strip(): if not line.strip():