diff options
author | Bren Briggs <bbriggs@users.noreply.github.com> | 2016-07-30 18:02:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-30 18:02:56 -0400 |
commit | ea30561975cccbb589dfccc230f57158753fdd29 (patch) | |
tree | 5e32c501ab59ae88b3b36bb69ab6fbe8585fba52 /spec/spec_helper.rb | |
parent | 336e3686c116aa8c1855430f31b68548e1f6558a (diff) | |
parent | edc5f2af7132742b4108310e661ea0ead4809e6d (diff) |
Merge pull request #67 from voxpupuli/modulesync
modulesync 0.11.0
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 047b126..92c8cbe 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,15 +3,13 @@ require 'rspec-puppet-facts' include RspecPuppetFacts RSpec.configure do |c| - c.default_facts = { - concat_basedir: '/tmp', - is_pe: false, - selinux_config_mode: 'disabled', + default_facts = { puppetversion: Puppet.version, - facterversion: Facter.version, - ipaddress: '172.16.254.254', - macaddress: 'AA:AA:AA:AA:AA:AA' + facterversion: Facter.version } + default_facts += YAML.read_file('default_facts.yml') if File.exist?('default_facts.yml') + default_facts += YAML.read_file('default_facts.yml') if File.exist?('default_module_facts.yml') + c.default_facts = default_facts end # vim: syntax=ruby |