beaker 4.19.0 → 4.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1ffd36126ef1c3aa4bc3fc1ad93dab786f7c8a67bc01749020e063c0d6642b
-  data.tar.gz: b4c320f7acf05904d85b899b1d7ea6e51a6097b5dae317eec0f3c4a6df533ac3
+  metadata.gz: 3e5c263e1126d9ce16c4cef1e66654ac95430e2eb34b96e8fd172622995b2f64
+  data.tar.gz: a28639cfe3220506de7a8a1a05ab86e1a6e9595a561a2bc7a640281b1d64ed67
 SHA512:
-  metadata.gz: d9ba01bffcfe9cfe356ff06bc294d32d248283b01e943139582d346fe7566a5ed8b4fe5ae5715ff1de57253f20a44eba3c50649c9876f4399aaf000ef53d64ad
-  data.tar.gz: b48a94b96ed04579fcb27842a69de75a70adf0c9fe93a5210b93a476321ce9139e4d3cb4bf9376f8708e6fd9f170bc83f863c0381a13a393b97d34c35ac37d89
+  metadata.gz: 20ef18122b339c7fc9c763799fb8c921d341e34cdd26ba2895014079bb687c82a08c73e0a9cdb2fa1887018ea7b89b4476f538bb6c9decc0966a8fbe6062b590
+  data.tar.gz: 3d338288fe6b2f627312f7623801e6d5d3914a63e0cea15a2cf61cfa16860068dfb37767941ded909c660173c6b0623419dfc2c5134ba5cd92dc84687d7571ac

data/CHANGELOG.md

@@ -20,7 +20,13 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
 - Fixed - for any bug fixes.
 - Security - in case of vulnerabilities.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.19.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.20.0...master)
+
+# [4.20.0](https://github.com/puppetlabs/beaker/compare/4.19.0...4.20.0)
+
+### Added
+
+- Vagrant RSync/SSH settings will now be picked up if set via beaker-vagrant ([#1634)[https://github.com/puppetlabs/beaker/pull/1634]] and beaker-vagrant [#28](https://github.com/puppetlabs/beaker-vagrant/pull/28))
 
 # [4.19.0](https://github.com/puppetlabs/beaker/compare/4.18.0...4.19.0)
 

data/lib/beaker/host.rb

@@ -547,8 +547,17 @@ module Beaker
 
       # vagrant uses temporary ssh configs in order to use dynamic keys
       # without this config option using ssh may prompt for password
-      if ssh_opts[:config] and File.exists?(ssh_opts[:config])
-        ssh_args << "-F #{ssh_opts[:config]}"
+      #
+      # We still want any user-set SSH config to win though
+      filesystem_ssh_config = nil
+      if ssh_opts[:config] && File.exists?(ssh_opts[:config])
+        filesystem_ssh_config = ssh_opts[:config]
+      elsif self[:vagrant_ssh_config] && File.exists?(self[:vagrant_ssh_config])
+        filesystem_ssh_config = self[:vagrant_ssh_config]
+      end
+
+      if filesystem_ssh_config
+        ssh_args << "-F #{filesystem_ssh_config}"
       else
         if ssh_opts.has_key?('keys') and
             ssh_opts.has_key?('auth_methods') and

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.19.0'
+    STRING = '4.20.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.19.0
+  version: 4.20.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec