Skip to content

Commit 99edda5

Browse files
Merge pull request #2586 from Magisus/trusted-facts-v4
(SERVER-3050) Bypass the fact cache in the v4 catalog endpoint
2 parents 01acfc9 + 1c2b813 commit 99edda5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

acceptance/scripts/generic/testrun.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ do_init()
88
exit -1;
99
fi
1010

11-
bundle exec beaker-hostgenerator $GENCONFIG_LAYOUT > $BEAKER_CONFIG
11+
bundle exec beaker-hostgenerator --hypervisor abs $GENCONFIG_LAYOUT > $BEAKER_CONFIG
1212

1313
BEAKER_INIT="bundle exec beaker init --debug"
1414
BEAKER_INIT="$BEAKER_INIT --type aio"

src/ruby/puppetserver-lib/puppet/server/compiler.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,10 @@ def extract_trusted_facts(request_data, facts)
208208
end
209209

210210
def get_facts_from_terminus(nodename, environment)
211+
# Ignore the cache terminus, which is not guaranteed to store trusted facts
211212
facts = Puppet::Node::Facts.indirection.find(nodename,
212-
{environment: environment})
213+
{environment: environment,
214+
ignore_cache: true})
213215

214216
# If no facts have been stored for the node, the terminus will return nil
215217
if facts.nil?

0 commit comments

Comments
 (0)