summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc A. Paradise <marc.paradise@gmail.com>2019-04-26 12:39:30 -0400
committerMarc A. Paradise <marc.paradise@gmail.com>2019-04-28 16:42:35 -0400
commit7f4509663710f942850f35d864a3c3c84f36ab3b (patch)
tree91cbb3067f2fd7c19b11925fa9638cf69f595105
parentb656051992251acf7edbd497392999e588e2c626 (diff)
downloadchef-7f4509663710f942850f35d864a3c3c84f36ab3b.tar.gz
Move most bootstrap requires into deps()
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
-rw-r--r--lib/chef/knife/bootstrap.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index c4fefc77cb..915486e698 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -18,10 +18,6 @@
require "chef/knife"
require "chef/knife/data_bag_secret_options"
-require "erubis"
-require "chef/knife/bootstrap/chef_vault_handler"
-require "chef/knife/bootstrap/client_builder"
-require "chef/util/path_helper"
class Chef
class Knife
@@ -389,7 +385,12 @@ class Chef
attr_reader :connection
deps do
+ require "erubis"
require "chef/json_compat"
+ require "chef/util/path_helper"
+ require "chef/knife/bootstrap/chef_vault_handler"
+ require "chef/knife/bootstrap/client_builder"
+ require "chef/knife/bootstrap/train_connector"
end
banner "knife bootstrap [PROTOCOL://][USER@]FQDN (options)"
@@ -622,8 +623,6 @@ class Chef
end
def do_connect(conn_options)
- require "chef/knife/bootstrap/train_connector"
-
@connection = TrainConnector.new(host_descriptor, connection_protocol, conn_options)
connection.connect!
end