beaker-vagrant 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4a6b7fd05dbad3dad572da7c2dcb0b6331d99759360ee6f13190dd663e4cb0c
-  data.tar.gz: 522a13a0e13bbbe36c0f789f9e1583f92cb09fddbe79c435c2b5d48c9b779c26
+  metadata.gz: 93a9b37ab076dd6a9f96004ac770392207eb44716d0982e6b2e75ffbc0b50cde
+  data.tar.gz: dfa41a6583033d37700edecdfcb7b4bbe0bb436bdd0530ac8bdf3d36067a156e
 SHA512:
-  metadata.gz: 41f1d7d61261464c2a1fafff23cc69c27cc8f7257ff6fd7f387cf4227e0e66fd3227c8ac56f0c7c7275c2dab409a9e1e635acd83f2a62b3554f97dbd0dc58741
-  data.tar.gz: bd51b818aea92e155e2c444d15d1db7e5423c09ad7ac667c4d92380438f5bcfc665cc2310e7ddd9abded88c45428ab512b609ed557ba0f638e1e49ba787fec37
+  metadata.gz: bb3a8b395078572279174074bc7d99b1da50f3a1d69853e0ba5b9a2cccb4c76398b5320fb907e3684980d7a7b55877402c4fc2aa8839b02057ee7fa2ffea3267
+  data.tar.gz: 99c44d83a570b5c71a61904fb62dfa7017af1ed7b01126543829e548c078a3c51c12ba170db84c2dc343f382e7a277949be9c77334bb60313274b1621b77a2cf

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -201,7 +201,9 @@ module Beaker
 
         f.write(ssh_config)
         f.rewind
-        host['ssh'] = {:config => f.path()}
+
+        host[:vagrant_ssh_config] = f.path
+        host['ssh'] = host['ssh'].merge(Net::SSH.configuration_for(host['ip'], f.path))
         host['user'] = user
         @temp_files << f
     end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -484,7 +484,8 @@ EOF
         expect( file ).to receive( :write ).with("Host ip.address.for.#{name}\n        HostName 127.0.0.1\n        User root\n        Port 2222\n        UserKnownHostsFile /dev/null\n        StrictHostKeyChecking no\n        PasswordAuthentication no\n        IdentityFile /home/root/.vagrant.d/insecure_private_key\n        IdentitiesOnly no")
 
         vagrant.set_ssh_config( host, 'root' )
-        expect( host['ssh'] ).to be === { :config => file.path }
+        expect( host[:vagrant_ssh_config] ).to be === '/path/sshconfig'
+        expect( host['ssh'][:config]).to be === false
         expect( host['user']).to be === 'root'
       end
 
@@ -498,7 +499,8 @@ EOF
           expect( file ).to receive( :write ).with("Host ip.address.for.#{name}\n        HostName 127.0.0.1\n        User root\n        Port 2222\n        UserKnownHostsFile /dev/null\n        StrictHostKeyChecking no\n        PasswordAuthentication no\n        IdentityFile /home/root/.vagrant.d/insecure_private_key\n        IdentitiesOnly yes")
 
           vagrant.set_ssh_config( host, 'root' )
-          expect( host['ssh'] ).to be === { :config => file.path }
+          expect( host[:vagrant_ssh_config] ).to be === '/path/sshconfig'
+          expect( host['ssh'][:config]).to be === false
           expect( host['user']).to be === 'root'
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec