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 #31374 from sjorge/solarish_hwaddr

Browse source 
fix for #31369
This commit is contained in:
Mike Place 2016-02-22 09:22:21 -07:00
commit fed096a29d
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/utils/network.py
View file

@ -518,6 +518,11 @@ def _interfaces_ifconfig(out):
iface = miface.group(1)
if mmac:
data['hwaddr'] = mmac.group(1)
if salt.utils.is_sunos():
expand_mac = []
for chunk in data['hwaddr'].split(':'):
expand_mac.append('0{0}'.format(chunk) if len(chunk) < 2 else '{0}'.format(chunk))
data['hwaddr'] = ':'.join(expand_mac)
if mip:
if 'inet' not in data:
data['inet'] = list()