summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application/agent.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/application/agent.rb')
-rw-r--r--lib/puppet/application/agent.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index ba203474a..985d87dd0 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -245,7 +245,10 @@ Puppet::Application.new(:agent) do
Puppet::Transaction::Report.terminus_class = :rest
- Puppet::Resource::Catalog.terminus_class = :rest
+ # Override the default; puppetd needs this, usually.
+ # You can still override this on the command-line with, e.g., :compiler.
+ Puppet[:catalog_terminus] = :rest
+
Puppet::Resource::Catalog.cache_class = :yaml
Puppet::Node::Facts.terminus_class = :facter