From 64958027af78457a7cc266dadb21327be0abac2a Mon Sep 17 00:00:00 2001 From: BogdanIrimie Date: Fri, 15 May 2020 11:22:14 +0300 Subject: [PATCH 1/2] (FACT-2522) Add default directories for external facts. --- lib/custom_facts/util/config.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/custom_facts/util/config.rb b/lib/custom_facts/util/config.rb index 3fca0af62..1ac2b0b9e 100644 --- a/lib/custom_facts/util/config.rb +++ b/lib/custom_facts/util/config.rb @@ -42,7 +42,11 @@ def self.setup_default_ext_facts_dirs Facter::Options[:default_external_dir] = if windows_dir [File.join(windows_dir, 'PuppetLabs', 'facter', 'facts.d')] else - ['/opt/puppetlabs/facter/facts.d'] + [ + '/etc/puppetlabs/facter/facts.d', + '/etc/facter/facts.d/', + '/opt/puppetlabs/facter/facts.d' + ] end elsif ENV['HOME'] Facter::Options[:default_external_dir] = From 91590c002f5839a8bd595f9ed6dc085c434c06f7 Mon Sep 17 00:00:00 2001 From: BogdanIrimie Date: Fri, 15 May 2020 11:54:51 +0300 Subject: [PATCH 2/2] (FACT-2522) Fix tests. --- lib/custom_facts/util/config.rb | 2 +- spec/custom_facts/util/config_spec.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/custom_facts/util/config.rb b/lib/custom_facts/util/config.rb index 1ac2b0b9e..a1dbeb8d9 100644 --- a/lib/custom_facts/util/config.rb +++ b/lib/custom_facts/util/config.rb @@ -46,7 +46,7 @@ def self.setup_default_ext_facts_dirs '/etc/puppetlabs/facter/facts.d', '/etc/facter/facts.d/', '/opt/puppetlabs/facter/facts.d' - ] + ] end elsif ENV['HOME'] Facter::Options[:default_external_dir] = diff --git a/spec/custom_facts/util/config_spec.rb b/spec/custom_facts/util/config_spec.rb index 62c1a3dc7..ba86c5fd8 100755 --- a/spec/custom_facts/util/config_spec.rb +++ b/spec/custom_facts/util/config_spec.rb @@ -57,7 +57,11 @@ allow(LegacyFacter::Util::Config).to receive(:windows_data_dir).and_return(nil) LegacyFacter::Util::Config.setup_default_ext_facts_dirs expect(LegacyFacter::Util::Config.external_facts_dirs) - .to eq ['/opt/puppetlabs/facter/facts.d'] + .to eq [ + '/etc/puppetlabs/facter/facts.d', + '/etc/facter/facts.d/', + '/opt/puppetlabs/facter/facts.d' + ] end it 'returns the default value for windows 2008' do