provisioners/puppet: don't repeat output when prov fails [GH-4303]

CHANGELOG.md

@@ -39,6 +39,8 @@ BUG FIXES:
   - provisioners/puppet: Manifest file can be a directory. [GH-4169]
   - provisioners/puppet: Properly escape facter variables for PowerShell
       on Windows guests. [GH-3959]
+  - provisioners/puppet: When provisioning fails, don't repeat all of
+      stdout/stderr. [GH-4303]
   - provisioners/salt: Update salt minion version on Windows. [GH-3932]
   - provisioners/shell: If args is an array and contains numbers, it no
       longer crashes. [GH-4234]

plugins/provisioners/puppet/provisioner/puppet.rb

@@ -159,7 +159,12 @@ module VagrantPlugins
             "vagrant.provisioners.puppet.running_puppet",
             manifest: config.manifest_file))
 
-          @machine.communicate.sudo(command, elevated: true, good_exit: [0,2]) do |type, data|
+          opts = {
+            elevated: true,
+            error_key: :ssh_bad_exit_status_muted,
+            good_exit: [0,2],
+          }
+          @machine.communicate.sudo(command, opts) do |type, data|
             if !data.chomp.empty?
               @machine.ui.info(data.chomp)
             end

templates/locales/en.yml

@@ -969,8 +969,10 @@ en:
 
         %{stderr}
       ssh_bad_exit_status_muted: |-
-        The SSH command responded with a non-zero exit status.
+        The SSH command responded with a non-zero exit status. Vagrant
-        Vagrant assumes that this means the command failed!
+        assumes that this means the command failed. The output for this command
+        should be in the log above. Please read the output to determine what
+        went wrong.
       ssh_connect_eacces: |-
         SSH is getting permission denied errors when attempting to connect
         to the IP for SSH. This is usually caused by network rules and not being