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 #25045 from garethgreenaway/24521_debian_networking

Browse source 
Fixes to debian_ip.py in 2015.5
This commit is contained in:
Justin Findlay 2015-06-30 11:36:42 -06:00
commit ebd6cdc412
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/debian_ip.py
View file

@ -1529,6 +1529,9 @@ def build_interface(iface, iface_type, enabled, **settings):
if iface_type not in _IFACE_TYPES:
_raise_error_iface(iface, iface_type, _IFACE_TYPES)
if 'proto' not in settings:
settings['proto'] = 'static'
if iface_type == 'slave':
settings['slave'] = 'yes'
if 'master' not in settings: