diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-02-24 14:25:24 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2017-02-28 11:19:48 -0800 |
| commit | 5db6276728e2d912650bfcc57643652db4dc2738 (patch) | |
| tree | eb92cf269b2eea8da00679097b3c9cbc1e412645 /spec/support/platform_helpers.rb | |
| parent | ef11843d6ce1f1553ec4b76deab6faad05cc08ff (diff) | |
| download | chef-5db6276728e2d912650bfcc57643652db4dc2738.tar.gz | |
Bump chef version to 13.0.0
This requires pulling in master of several gems, bumps all
the other gems, plus pulls in new kitchen-appbundle-updater
which supports pulling master of ohai.
Note that kitchen-windows is disabled because it turns out
it was broken and red on 12.19 all along.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'spec/support/platform_helpers.rb')
| -rw-r--r-- | spec/support/platform_helpers.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index fb50ee2298..120e73740d 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -1,5 +1,6 @@ require "fcntl" require "chef/mixin/shell_out" +require "ohai/mixin/http_helper" require "ohai/mixin/gce_metadata" class ShellHelpers @@ -221,12 +222,12 @@ def fips? ENV["CHEF_FIPS"] == "1" end -class GCEDetector - extend Ohai::Mixin::GCEMetadata +class HttpHelper + extend Ohai::Mixin::HttpHelper end def gce? - GCEDetector.can_metadata_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80) + HttpHelper.can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80) rescue SocketError false end |