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

Make salt.utils.network.linux_interfaces work in cron

Browse Source
This commit is contained in:
Erik Johnson 2013-12-10 16:08:35 -06:00
parent c0f03a3297
commit 66307b0e9b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/utils/network.py
View File

@ -295,23 +295,25 @@ def linux_interfaces():
Obtain interface information for *NIX/BSD variants Obtain interface information for *NIX/BSD variants
''' '''
ifaces = dict() ifaces = dict()
if salt.utils.which('ip'): ip_path = salt.utils.which('ip')
ifconfig_path = None if ip_path else salt.utils.which('ifconfig')
if ip_path:
cmd1 = subprocess.Popen( cmd1 = subprocess.Popen(
'ip link show', '{0} link show'.format(ip_path),
shell=True, shell=True,
close_fds=True, close_fds=True,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT).communicate()[0] stderr=subprocess.STDOUT).communicate()[0]
cmd2 = subprocess.Popen( cmd2 = subprocess.Popen(
'ip addr show', '{0} addr show'.format(ip_path),
shell=True, shell=True,
close_fds=True, close_fds=True,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT).communicate()[0] stderr=subprocess.STDOUT).communicate()[0]
ifaces = _interfaces_ip(cmd1 + '\n' + cmd2) ifaces = _interfaces_ip(cmd1 + '\n' + cmd2)
elif salt.utils.which('ifconfig'): elif ifconfig_path:
cmd = subprocess.Popen( cmd = subprocess.Popen(
'ifconfig -a', '{0} -a'.format(ifconfig_path),
shell=True, shell=True,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT).communicate()[0] stderr=subprocess.STDOUT).communicate()[0]