mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #854 from sfromm/fixes
A couple fixes for setup module
This commit is contained in:
commit
2adff56ef5
1 changed files with 7 additions and 2 deletions
|
@ -453,8 +453,13 @@ class LinuxNetwork(Network):
|
|||
ipv4_address = None,
|
||||
ipv6_address = None
|
||||
)
|
||||
|
||||
output = subprocess.Popen(['ip','addr'], stdout=subprocess.PIPE).communicate()[0]
|
||||
ipbin = '/sbin/ip'
|
||||
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'):
|
||||
if line:
|
||||
words = line.split()
|
||||
|
|
Loading…
Reference in a new issue