lib/supply_drop/plugin.rb in supply_drop-0.12.0 vs lib/supply_drop/plugin.rb in supply_drop-0.13.0

@@ -8,10 +8,10 @@
         rsync_cmd = SupplyDrop::Rsync.command(
           puppet_source,
           SupplyDrop::Rsync.remote_address(server.user || fetch(:user, ENV['USER']), server.host, puppet_destination),
           :delete => true,
           :excludes => puppet_excludes,
-          :ssh => { :keys => ssh_options[:keys], :config => ssh_options[:config], :port => fetch(:port, nil) }
+          :ssh => ssh_options.merge(server.options[:ssh_options]||{})
         )
         logger.debug rsync_cmd
         server.host unless system rsync_cmd
       end.compact