valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2451 from twinshadow/patch-2

Browse Source 
Update salt/modules/network.py: get all interfaces for the `ip` command
This commit is contained in:
Thomas S Hatch 2012-11-05 11:31:40 -08:00
commit 87cefbbb99
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/network.py
View File

@ -233,8 +233,9 @@ def interfaces():
'''
ifaces = dict()
if __salt__['cmd.has_exec']('ip'):
cmd = __salt__['cmd.run']('ip addr show')
ifaces = _interfaces_ip(cmd)
cmd1 = __salt__['cmd.run']('ip link show')
cmd2 = __salt__['cmd.run']('ip addr show')
ifaces = _interfaces_ip(cmd1 + cmd2)
elif __salt__['cmd.has_exec']('ifconfig'):
cmd = __salt__['cmd.run']('ifconfig -a')
ifaces = _interfaces_ifconfig(cmd)