mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #23922 from garethgreenaway/23900_2015_5_bonding_interface_fixes
Fixes to debian_ip.py
This commit is contained in:
commit
b818f72dce
1 changed files with 5 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue