Failing specs resolved

Signed-off-by: sanga17 <sausekar@msystechnologies.com>

2 files changed, 7 insertions, 3 deletions

diff --git a/knife/lib/chef/knife/bootstrap.rb b/knife/lib/chef/knife/bootstrap.rb
index 7317fdc34b..756b73ec43 100644
--- a/knife/lib/chef/knife/bootstrap.rb
+++ b/knife/lib/chef/knife/bootstrap.rb
@@ -980,7 +980,11 @@ class Chef
 
         gateway_identity_file = config[:ssh_gateway] ? config[:ssh_gateway_identity] : nil
         unless gateway_identity_file.nil?
-          opts[:key_files] << gateway_identity_file
+          if opts[:key_files].nil?
+            opts[:key_files] = [gateway_identity_file]
+          else
+            opts[:key_files] << gateway_identity_file
+          end
         end
 
         opts
diff --git a/knife/spec/unit/knife/bootstrap_spec.rb b/knife/spec/unit/knife/bootstrap_spec.rb
index 30878edf39..0ccbf8b01e 100644
--- a/knife/spec/unit/knife/bootstrap_spec.rb
+++ b/knife/spec/unit/knife/bootstrap_spec.rb
@@ -1127,7 +1127,7 @@ describe Chef::Knife::Bootstrap do
           let(:expected_result) do
             {
               forward_agent: false,
-              key_files: [],
+              key_files: nil,
               logger: Chef::Log,
               keys_only: false,
               sudo: false,
@@ -1307,7 +1307,7 @@ describe Chef::Knife::Bootstrap do
       context "when no identity file is specified" do
         it "generates the expected configuration (no keys, keys_only false)" do
           expect(knife.ssh_identity_opts).to eq( {
-            key_files: [ ],
+            key_files: nil,
             keys_only: false,
           })
         end