diff options
author | Daniel Paul Searles <daniel@flowboard.com> | 2014-06-23 13:25:57 -0700 |
---|---|---|
committer | Daniel Paul Searles <daniel@flowboard.com> | 2014-06-23 13:25:57 -0700 |
commit | c0f76a272900e032c9fdadbf11503b57dd26f18f (patch) | |
tree | ca5d46f31fe21f35c28d74e81995b21a6ccee29c | |
parent | 0fa02ae5849f51f6caafdf422aa79409251458aa (diff) | |
parent | edd8e3c1ea34f4cb8c723eee2fda958f521efbe5 (diff) | |
download | ohai-c0f76a272900e032c9fdadbf11503b57dd26f18f.tar.gz |
Merge branch 'master' of github.com:gtmanfred/ohai
-rw-r--r-- | lib/ohai/plugins/rackspace.rb | 7 |
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) |