Merge branch 'master' of github.com:gtmanfred/ohai

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/ohai/plugins/rackspace.rb b/lib/ohai/plugins/rackspace.rb
index 4601d4be..2fb98348 100644
--- a/lib/ohai/plugins/rackspace.rb
+++ b/lib/ohai/plugins/rackspace.rb
@@ -119,6 +119,7 @@ Ohai.plugin(:Rackspace) do
   end
 
   collect_data do
+    require "resolv"
     # Adds rackspace Mash
     if looks_like_rackspace?
       rackspace Mash.new
@@ -129,7 +130,11 @@ Ohai.plugin(:Rackspace) do
       rackspace[:public_ipv4] = rackspace[:public_ip]
       get_global_ipv6_address(:public_ipv6, :eth0)
       unless rackspace[:public_ip].nil?
-        rackspace[:public_hostname] = "#{rackspace[:public_ip].gsub('.','-')}.static.cloud-ips.com"
+        rackspace[:public_hostname] = begin
+                                        Resolv.getname(rackspace[:public_ip])
+                                      rescue SocketError
+                                        rackspace[:public_ip]
+                                      end
       end
       rackspace[:local_ipv4] = rackspace[:private_ip]
       get_global_ipv6_address(:local_ipv6, :eth1)