From 56c66edaffc757d803f990b6ac557b0de1976c59 Mon Sep 17 00:00:00 2001
From: Trevor Vaughan <tvaughan@onyxpoint.com>
Date: Wed, 18 Mar 2020 14:06:31 -0400
Subject: [PATCH 1/3] (BKR-1423) Pick up Vagrant config for rsync

Ensure that rsync connections use the on-disk Vagrant SSH configuraiton
if an alternate physical SSH configuration has not been specified.

Correlates directly with puppetlabs/beaker-vagrant#28
---
 lib/beaker/host.rb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/beaker/host.rb b/lib/beaker/host.rb
index 7bbe7b597c..012b652f58 100644
--- a/lib/beaker/host.rb
+++ b/lib/beaker/host.rb
@@ -547,8 +547,17 @@ def do_rsync_to from_path, to_path, opts = {}
 
       # 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

From 43202670519fab82875f7fa9ba7c35507c56f0d0 Mon Sep 17 00:00:00 2001
From: Brandon High <brandon.high@puppet.com>
Date: Thu, 19 Mar 2020 12:31:20 -0700
Subject: [PATCH 2/3] Update CHANGELOG for 4.20.0

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c0f63410a..da30ee9704 100644
--- a/CHANGELOG.md
+++ b/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)
 

From b810cd2f9300e7d75655cf4b9bace3378b8c4bee Mon Sep 17 00:00:00 2001
From: Jenkins <qe-team@puppet.com>
Date: Thu, 19 Mar 2020 19:33:02 +0000
Subject: [PATCH 3/3] (GEM) update beaker version to 4.20.0

---
 lib/beaker/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/beaker/version.rb b/lib/beaker/version.rb
index e6025dd2f8..66d19e9dea 100644
--- a/lib/beaker/version.rb
+++ b/lib/beaker/version.rb
@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.19.0'
+    STRING = '4.20.0'
   end
 end