From edc5f2af7132742b4108310e661ea0ead4809e6d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 29 Jul 2016 19:42:21 +0200 Subject: modulesync 0.11.0 --- spec/default_facts.yml | 6 ++++++ spec/spec_helper.rb | 12 +++++------- 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 spec/default_facts.yml (limited to 'spec') diff --git a/spec/default_facts.yml b/spec/default_facts.yml new file mode 100644 index 0000000..a3f52bf --- /dev/null +++ b/spec/default_facts.yml @@ -0,0 +1,6 @@ +--- +concat_basedir: "/tmp" +ipaddress: "172.16.254.254" +is_pe: false +macaddress: "AA:AA:AA:AA:AA:AA" +selinux_config_mode: "disabled" 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 -- cgit v1.2.3