valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing issue reported when using bonded interfaces on Ubuntu. Attributes should be bond-, but the code was attempting to split just on bond_. Fix accounts for both, but the debian_ip.py module will write out bond attributes with bond-

Browse Source
This commit is contained in:
Gareth J. Greenaway 2015-05-19 08:28:57 -07:00
parent f7eb70ca60
commit 0bba536d6d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/debian_ip.py
View File

@ -591,7 +591,11 @@ def _parse_interfaces(interface_files=None):
iface_dict['ethtool'][attr] = valuestr
elif attr.startswith('bond'):
opt = attr.split('_', 1)[1]
if '-' in attr:
opt = attr.split('-', 1)[1]
elif '_' in attr:
# Just in case configuration still has bond_
opt = attr.split('_', 1)[1]
if 'bonding' not in iface_dict:
iface_dict['bonding'] = salt.utils.odict.OrderedDict()
iface_dict['bonding'][opt] = valuestr