diff options
| author | Lamont Granquist <454857+lamont-granquist@users.noreply.github.com> | 2022-01-04 12:48:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-04 12:48:23 -0800 |
| commit | 4836ab45f96786e2ef07dc860eba266959336ed5 (patch) | |
| tree | 272abc66bcccdb846a9d3eae3955af877903f0da /knife | |
| parent | 6432754de3a5099177ce8d0e04d112f8e156758f (diff) | |
| parent | 1bf995b32c5a049e9b55c08e7434419a586aa190 (diff) | |
| download | chef-4836ab45f96786e2ef07dc860eba266959336ed5.tar.gz | |
Merge pull request #12409 from chef/faster_knife
Diffstat (limited to 'knife')
| -rw-r--r-- | knife/lib/chef/knife/bootstrap.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/knife/lib/chef/knife/bootstrap.rb b/knife/lib/chef/knife/bootstrap.rb index 8909abd45b..e2b9993e60 100644 --- a/knife/lib/chef/knife/bootstrap.rb +++ b/knife/lib/chef/knife/bootstrap.rb @@ -20,6 +20,7 @@ require_relative "../knife" require_relative "data_bag_secret_options" require "chef-utils/dist" unless defined?(ChefUtils::Dist) require "license_acceptance/cli_flags/mixlib_cli" +require "chef/json_compat" unless defined?(Chef::JSONCompat) # can't be lazy loaded since it's used in options module LicenseAcceptance autoload :Acceptor, "license_acceptance/acceptor" @@ -416,9 +417,6 @@ class Chef attr_reader :connection deps do - require "erubis" unless defined?(Erubis) - require "net/ssh" unless defined?(Net::SSH) - require "chef/json_compat" unless defined?(Chef::JSONCompat) require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper) require_relative "bootstrap/chef_vault_handler" require_relative "bootstrap/client_builder" @@ -544,6 +542,7 @@ class Chef end def render_template + require "erubis" unless defined?(Erubis) @config[:first_boot_attributes] = first_boot_attributes template_file = find_template template = IO.read(template_file).chomp |