ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #854 from sfromm/fixes

Browse source 
A couple fixes for setup module
This commit is contained in:
Michael DeHaan 2012-08-12 05:16:05 -07:00
commit 2adff56ef5
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/setup
View file

@ -453,8 +453,13 @@ class LinuxNetwork(Network):
ipv4_address = None, ipv4_address = None,
ipv6_address = None ipv6_address = None
) )
ipbin = '/sbin/ip'
output = subprocess.Popen(['ip','addr'], stdout=subprocess.PIPE).communicate()[0] if not os.path.exists(ipbin):
if os.path.exists('/usr/sbin/ip'):
ipbin = '/usr/sbin/ip'
else:
return interfaces, ips
output = subprocess.Popen([ipbin, 'addr', 'show'], stdout=subprocess.PIPE).communicate()[0]
for line in output.split('\n'): for line in output.split('\n'):
if line: if line:
words = line.split() words = line.split()