diff options
Diffstat (limited to 'lib/chef/knife/bootstrap')
| -rw-r--r-- | lib/chef/knife/bootstrap/chef_vault_handler.rb | 1 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/client_builder.rb | 1 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/train_connector.rb | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/lib/chef/knife/bootstrap/chef_vault_handler.rb b/lib/chef/knife/bootstrap/chef_vault_handler.rb index 605a9d359b..b6a292fda0 100644 --- a/lib/chef/knife/bootstrap/chef_vault_handler.rb +++ b/lib/chef/knife/bootstrap/chef_vault_handler.rb @@ -145,6 +145,7 @@ class Chef if Gem::Version.new(ChefVault::VERSION) < Gem::Version.new("2.6.0") raise error_message end + true rescue LoadError raise error_message diff --git a/lib/chef/knife/bootstrap/client_builder.rb b/lib/chef/knife/bootstrap/client_builder.rb index 87dd03d6ed..3dee318414 100644 --- a/lib/chef/knife/bootstrap/client_builder.rb +++ b/lib/chef/knife/bootstrap/client_builder.rb @@ -188,6 +188,7 @@ class Chef true rescue Net::HTTPClientException => e raise unless e.response.code == "404" + false end diff --git a/lib/chef/knife/bootstrap/train_connector.rb b/lib/chef/knife/bootstrap/train_connector.rb index da5db65de0..490be38f3e 100644 --- a/lib/chef/knife/bootstrap/train_connector.rb +++ b/lib/chef/knife/bootstrap/train_connector.rb @@ -213,6 +213,7 @@ class Chef if result.exit_status != 0 raise RemoteExecutionFailed.new(hostname, command, result) end + result end @@ -247,6 +248,7 @@ class Chef # Return a hash of winrm options based on configuration already built. def opts_inferred_from_winrm(config, opts_in) return {} unless config[:backend] == "winrm" + opts_out = {} if opts_in[:ssl] @@ -296,6 +298,7 @@ class Chef # itself - causing SSH config data to be ignored def missing_opts_from_ssh_config(config, opts_in) return {} unless config[:backend] == "ssh" + host_cfg = ssh_config_for_host(config[:host]) opts_out = {} opts_in.each do |key, _value| |