projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
3b3f133
)
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
author
Stephen Gran
<steve@lobefin.net>
Tue, 21 Sep 2010 20:31:29 +0000
(21:31 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Tue, 21 Sep 2010 20:31:29 +0000
(21:31 +0100)
facts/ipaddresses.rb
patch
|
blob
|
history
diff --git
a/facts/ipaddresses.rb
b/facts/ipaddresses.rb
index
eddbe66
..
01e2012
100644
(file)
--- a/
facts/ipaddresses.rb
+++ b/
facts/ipaddresses.rb
@@
-19,6
+19,30
@@
Facter.add("v4ips") do
end
end
+Facter.add("v4ips") do
+ confine :kernel => %w{FreeBSD}
+ setcode do
+ addrs = []
+ output = %x{/sbin/ifconfig}
+
+ output.split(/^\S/).each { |str|
+ if str =~ /inet ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+ tmp = $1
+ unless tmp =~ /127\./
+ addrs << tmp
+ break
+ end
+ end
+ }
+
+ ret = addrs.join(",")
+ if ret.empty?
+ ret = 'no'
+ end
+ ret
+ end
+end
+
Facter.add("v6ips") do
confine :kernel => :linux
addrs = []