saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29198 from jfindlay/single_mtu

Browse source 
rh_ip module: only set the mtu once
This commit is contained in:
Mike Place 2015-11-25 11:11:09 -07:00
commit 11d68f7b1c
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/modules/rh_ip.py
View file

@ -561,7 +561,7 @@ def _parse_settings_eth(opts, iface_type, enabled, iface):
if 'mtu' in opts:
try:
result['mtu'] = int(opts['mtu'])
except Exception:
except ValueError:
_raise_error_iface(iface, 'mtu', ['integer'])
if iface_type not in ['bridge']:
@ -632,13 +632,6 @@ def _parse_settings_eth(opts, iface_type, enabled, iface):
if opt in opts:
result[opt] = opts[opt]
if 'mtu' in opts:
try:
int(opts['mtu'])
result['mtu'] = opts['mtu']
except Exception:
_raise_error_iface(iface, 'mtu', ['integer'])
if 'ipv6_autoconf' in opts:
result['ipv6_autoconf'] = opts['ipv6_autoconf']