Skip to content

Commit 400afeb

Browse files
Merge pull request #646 from puppetlabs/maint-update-default-facts-with-hostname
(MAINT) - Update default fact with hostname
2 parents 9b2b642 + 78a24f9 commit 400afeb

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

spec/default_facts.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
# Facts specified here will override the values provided by rspec-puppet-facts.
44
---
55
networking:
6-
ip: "172.16.254.254"
7-
ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
8-
mac: "AA:AA:AA:AA:AA:AA"
6+
ip: "172.16.254.254"
7+
ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
8+
mac: "AA:AA:AA:AA:AA:AA"
9+
hostname: 'kubernetes.localhost'
910
is_pe: false

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
next unless File.exist?(f) && File.readable?(f) && File.size?(f)
2626

2727
begin
28-
default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
28+
default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
2929
rescue StandardError => e
3030
RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
3131
end

0 commit comments

Comments
 (0)