X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fipaddresses.rb;h=41f44e3a1a742a5b363d3c675e8b255aaa634462;hb=d55193d32bcface5935ae2a6acc2cdc6eed71a80;hp=05e3e9097a17435ef4324c672b562366302b603b;hpb=e06b59cd9caf42918d3d1255b2ab3f7e209be0f9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/ipaddresses.rb b/modules/debian-org/lib/facter/ipaddresses.rb
index 05e3e9097..41f44e3a1 100644
--- a/modules/debian-org/lib/facter/ipaddresses.rb
+++ b/modules/debian-org/lib/facter/ipaddresses.rb
@@ -1,22 +1,22 @@
 Facter.add("v4ips") do
-        confine :kernel => :linux
-        addrs = []
-        if FileTest.exist?("/bin/ip")
-                %x{ip addr list}.each do |line|
-                        next unless line =~ /\s+inet/
-                        next if line =~ /scope (link|host)/
-                        if line =~ /\s+inet\s+(\S+)\/\d{1,2} .*/
-                                addrs << $1
-                        end
-                end
-        end
-        ret = addrs.join(",")
-        if ret.empty?
-          ret = 'no'
-        end
-        setcode do
-          ret
-        end
+	confine :kernel => :linux
+	addrs = []
+	if FileTest.exist?("/bin/ip")
+		%x{ip addr list}.each_line do |line|
+			next unless line =~ /\s+inet/
+			next if line =~ /scope (link|host)/
+			if line =~ /\s+inet\s+(\S+)\/\d{1,2} .*/
+				addrs << $1
+			end
+		end
+	end
+	ret = addrs.join(",")
+	if ret.empty?
+		ret = ''
+	end
+	setcode do
+		ret
+	end
 end
 
 Facter.add("v4ips") do
@@ -37,30 +37,30 @@ Facter.add("v4ips") do
 
 		ret = addrs.join(",")
 		if ret.empty?
-			ret = 'no'
+			ret = ''
 		end
 		ret
 	end
 end
 
 Facter.add("v6ips") do
-        confine :kernel => :linux
-        addrs = []
-        if FileTest.exist?("/bin/ip")
-                %x{ip addr list}.each do |line|
-                        next unless line =~ /\s+inet/
-                        next if line =~ /scope (link|host)/
-                        if line =~ /\s+inet6\s+(\S+)\/\d{1,3} .*/
-                                addrs << $1
-                        end
-                end
-        end
-        ret = addrs.join(",")
-        if ret.empty?
-          ret = 'no'
-        end
-        setcode do
-          ret
-        end
+	confine :kernel => :linux
+	addrs = []
+	if FileTest.exist?("/bin/ip")
+		%x{ip addr list}.each_line do |line|
+			next unless line =~ /\s+inet/
+			next if line =~ /scope (link|host)/
+			if line =~ /\s+inet6\s+(\S+)\/\d{1,3} .*/
+				addrs << $1
+			end
+		end
+	end
+	ret = addrs.join(",")
+	if ret.empty?
+		ret = ''
+	end
+	setcode do
+		ret
+	end
 end