Merge pull request #108 from edward-harley/fix_failed_nodes_report

Fix failed nodes report

Author: bastelfreak

lib/puppet/catalog-diff/compilecatalog.rb

@@ -116,7 +116,7 @@ def compile_catalog(node_name, server, certless, tls_cert, tls_key, tls_ca, deri
               else
                 Puppet.runtime[:http].get(uri, headers: headers, options: { ssl_context: ssl_context })
               end
-        raise "HTTP request to Puppetserver #{server} failed with: HTTP #{ret.code} - #{ret.reason}" unless ret.success?
+        raise "HTTP request to Puppetserver #{server} failed with: HTTP #{ret.code} - #{ret.body}" unless ret.success?
       rescue Exception => e
         raise "Failed to retrieve catalog for #{node_name} from #{server} in environment #{environment}: #{e.message}"
       end

lib/puppet/face/catalog/diff.rb

@@ -212,7 +212,7 @@
         # User passed us two hostnames
         old_catalogs = Dir.mktmpdir("#{catalog1.tr('/', '_')}-")
         new_catalogs = Dir.mktmpdir("#{catalog2.tr('/', '_')}-")
-        pull_output = Puppet::Face[:catalog, '0.0.1'].pull(
+        @pull_output = Puppet::Face[:catalog, '0.0.1'].pull(
           old_catalogs, new_catalogs,
           options[:fact_search],
           old_server: catalog1, new_server: catalog2,
@@ -237,7 +237,7 @@
         nodes = diff_output
         FileUtils.rm_rf(old_catalogs)
         FileUtils.rm_rf(new_catalogs)
-        nodes[:pull_output] = pull_output
+        nodes[:pull_output] = @pull_output
         return nodes
       end
       raise 'No nodes were matched' if nodes.size.zero?
@@ -258,6 +258,7 @@
       nodes[:total_nodes]        = total_nodes
       nodes[:date]               = Time.new.iso8601
       nodes[:all_changed_nodes]  = with_changes.keys
+      nodes[:pull_output]        = @pull_output unless @pull_output.nil?
 
       if options[:output_report]
         Puppet.notice("Writing report to disk: #{options[:output_report]}")