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

Accept interfaces without address family or method (#34200)

Browse source
This commit is contained in:
Bobby Watson 2018-02-09 10:09:09 -05:00 committed by John R Barker
parent 15b0371eb2
commit 79b0739ba2
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/system/interfaces_file.py
View file

@ -208,14 +208,15 @@ def read_interfaces_lines(module, line_strings):
"down": [], "down": [],
"post-up": [] "post-up": []
} }
iface_name, address_family_name, method_name = words[1:4] iface_name = words[1]
if len(words) != 4: try:
module.fail_json(msg="Incorrect number of parameters (%d) in line %d, must be exectly 3" % (len(words), i)) currif['address_family'] = words[2]
# TODO: put line and count parameters except IndexError:
return None, None currif['address_family'] = None
try:
currif['address_family'] = address_family_name currif['method'] = words[3]
currif['method'] = method_name except IndexError:
currif['method'] = None
ifaces[iface_name] = currif ifaces[iface_name] = currif
lines.append({'line': line, 'iface': iface_name, 'line_type': 'iface', 'params': currif}) lines.append({'line': line, 'iface': iface_name, 'line_type': 'iface', 'params': currif})