diff --git a/lib/chef/knife/solo_cook.rb b/lib/chef/knife/solo_cook.rb index 79f65ec7..183876e4 100644 --- a/lib/chef/knife/solo_cook.rb +++ b/lib/chef/knife/solo_cook.rb @@ -127,6 +127,10 @@ def sync_kitchen upload_to_provision_path(:environment_path, 'environments') end + def ssl_verify_mode + Chef::Config[:ssl_verify_mode] || :verify_peer + end + def expand_path(path) Pathname.new(path).expand_path end diff --git a/lib/knife-solo/resources/solo.rb.erb b/lib/knife-solo/resources/solo.rb.erb index e8039770..5a40302e 100644 --- a/lib/knife-solo/resources/solo.rb.erb +++ b/lib/knife-solo/resources/solo.rb.erb @@ -6,6 +6,7 @@ data_bag_path File.join(base, 'data_bags') encrypted_data_bag_secret File.join(base, 'data_bag_key') environment_path File.join(base, 'environments') environment <%= node_environment.inspect %> +ssl_verify_mode <%= ssl_verify_mode.inspect %> cookbook_path [] <% cookbook_paths.each_with_index do |path, i| -%> diff --git a/test/solo_cook_test.rb b/test/solo_cook_test.rb index 1097e447..a139250a 100644 --- a/test/solo_cook_test.rb +++ b/test/solo_cook_test.rb @@ -34,6 +34,16 @@ def test_rsync_exclude_sources_chefignore end end + def test_sets_ssl_verify_mode_returns_verify_peer_for_nil + Chef::Config[:ssl_verify_mode] = nil + assert_equal :verify_peer, command.ssl_verify_mode + end + + def test_sets_ssl_verify_mode + Chef::Config[:ssl_verify_mode] = :verify_none + assert_equal :verify_none, command.ssl_verify_mode + end + def test_expanded_config_paths_returns_empty_array_for_nil Chef::Config[:foo] = nil assert_equal [], command.expanded_config_paths(:foo)