diff options
| author | Tim Smith <tsmith@chef.io> | 2017-04-11 08:33:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 08:33:55 -0700 |
| commit | 3e0a5a023c55009e715e98b27b22f4c7d40f3fbc (patch) | |
| tree | 5b100812fae145e1c898d8d14569f643a741d0a0 | |
| parent | d880c8a21de79fb3011584b955fb3a8e7cd2f013 (diff) | |
| parent | 2a76815b2e15f12bfe59f57d91d0be975b7fdf0a (diff) | |
| download | ohai-3e0a5a023c55009e715e98b27b22f4c7d40f3fbc.tar.gz | |
Merge pull request #987 from akitada/fix_eucalyptus
Fix Eucalyptus plugin to use the HttpHelper mixin
| -rw-r--r-- | lib/ohai/plugins/eucalyptus.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ohai/plugins/eucalyptus.rb b/lib/ohai/plugins/eucalyptus.rb index d9febfcb..82ee391d 100644 --- a/lib/ohai/plugins/eucalyptus.rb +++ b/lib/ohai/plugins/eucalyptus.rb @@ -19,9 +19,11 @@ # eucalyptus metadata service is compatible with the ec2 service calls require "ohai/mixin/ec2_metadata" +require "ohai/mixin/http_helper" Ohai.plugin(:Eucalyptus) do include Ohai::Mixin::Ec2Metadata + include Ohai::Mixin::HttpHelper provides "eucalyptus" depends "network/interfaces" @@ -53,7 +55,7 @@ Ohai.plugin(:Eucalyptus) do def looks_like_euca? # Try non-blocking connect so we don't "block" if # the metadata service doesn't respond - hint?("eucalyptus") || has_euca_mac? && can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80) + hint?("eucalyptus") || has_euca_mac? && can_socket_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80) end collect_data do |