Refactor default fact loading

This gets rids of the default facts because our modules do not rely on
them.

More importantly it switches to using add_custom_fact so we don't break
the built in facts from rspec-puppet-facts.

config_defaults.yml

@@ -122,6 +122,8 @@ Rakefile:
   default_enabled_rake_targets:
   - 'metadata_lint'
   - 'release_checks'
+spec/default_facts.yml:
+  delete: true
 spec/classes/coverage_spec.rb:
   delete: true
 spec/acceptance/nodesets/centos-511-x64.yml:

moduleroot/spec/spec_helper.rb.erb

@@ -11,6 +11,15 @@ require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 include RspecPuppetFacts
 
+if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
+  facts = YAML.load(File.read(File.join(__dir__, 'default_module_facts.yml')))
+  if facts
+    facts.each do |name, value|
+      add_custom_fact name.to_sym, value
+    end
+  end
+end
+
 <% if @configs['augeasproviders'] -%>
 # Setup augeasproviders
 require 'pathname'
@@ -42,14 +51,10 @@ if Dir.exist?(File.expand_path('../../lib', __FILE__))
 end
 
 RSpec.configure do |c|
-  default_facts = {}
-  default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
-  default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
-  c.default_facts = default_facts
   <%- if @configs['hiera_config'] -%>
   c.hiera_config = <%= @configs['hiera_config'] %>
-  <%- end -%>
 
+  <%- end -%>
   # Coverage generation
   c.after(:suite) do
     RSpec::Puppet::Coverage.report!