CHEF-5282: add "verify-api-cert true" to be default in bootstrap client config and add ssl peer verify as option.

lib/chef/knife/bootstrap.rb

@@ -94,6 +94,14 @@ class Bootstrap < Knife
         :description => "Do not proxy locations for the node being bootstrapped; this option is used internally by Opscode",
         :proc => Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
 
+      option :disable_api_cert_verify,
+        :long => "--disable-api-cert-verify",
+        :description => "Disables SSL certificate verification against your Chef server"
+
+      option :client_ssl_peer_verify,
+        :long => "--client-ssl-peer-verify",
+        :description => "Enables SSL peer verification in client configuration"
+
       option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",

lib/chef/knife/core/bootstrap_context.rb

@@ -66,6 +66,16 @@ def config_content
 chef_server_url  "#{@chef_config[:chef_server_url]}"
 validation_client_name "#{@chef_config[:validation_client_name]}"
 CONFIG
+          if @config[:disable_api_cert_verify]
+            client_rb << %Q{verify_api_cert false\n}
+          else
+            client_rb << %Q{verify_api_cert true\n}
+          end
+
+          if @config[:client_ssl_peer_verify]
+            client_rb << %Q{ssl_verify_mode :verify_peer\n}
+          end
+
           if @config[:chef_node_name]
             client_rb << %Q{node_name "#{@config[:chef_node_name]}"\n}
           else

spec/unit/knife/core/bootstrap_context_spec.rb

@@ -57,6 +57,7 @@
 log_location     STDOUT
 chef_server_url  "http://chef.example.com:4444"
 validation_client_name "chef-validator-testing"
+verify_api_cert true
 # Using default node name (fqdn)
 EXPECTED
     bootstrap_context.config_content.should eq expected
@@ -102,6 +103,20 @@
     end
   end
 
+  describe "when disabling SSL cert verification against Chef server" do
+    let(:config){ {:disable_api_cert_verify => true }}
+    it "supplies --disable-api-cert-verify as a flag to disable SSL cert verification against Chef" do
+      bootstrap_context.config_content.should match(/verify_api_cert false/)
+    end
+  end
+
+  describe "when enabling SSL peer verification" do
+    let(:config){ {:client_ssl_peer_verify => true }}
+    it "supplies --client-ssl-peer-verify as a flag to indicate enabling peer verification for the client" do
+      bootstrap_context.config_content.should match(/ssl_verify_mode \:verify_peer/)
+    end
+  end
+
   describe "when installing an explicit version of chef" do
     let(:chef_config) do
       {