summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorRein Henrichs <rein@puppetlabs.com>2010-06-07 15:45:45 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit9d0a38ee1baa295fb8d2b69f13cbfc91b5de5800 (patch)
treeffd8f1cb1dda2d0d60866ad93983ed600b4ab801 /lib/puppet/application
parent2874729efa22c56dde61654e7429bdbb4e41f9ef (diff)
downloadpuppet-9d0a38ee1baa295fb8d2b69f13cbfc91b5de5800.tar.gz
puppet-9d0a38ee1baa295fb8d2b69f13cbfc91b5de5800.tar.xz
puppet-9d0a38ee1baa295fb8d2b69f13cbfc91b5de5800.zip
[#3921] Add facts_terminus setting to Puppet settings
* defaults to "facter"
Diffstat (limited to 'lib/puppet/application')
-rw-r--r--lib/puppet/application/agent.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index 609a4580a..8353dd89f 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -246,9 +246,11 @@ class Puppet::Application::Agent < Puppet::Application
# You can still override this on the command-line with, e.g., :compiler.
Puppet[:catalog_terminus] = :rest
+ # Override the default.
+ Puppet[:fact_terminus] = :facter
+
Puppet::Resource::Catalog.cache_class = :yaml
- Puppet::Node::Facts.terminus_class = :facter
# We need tomake the client either way, we just don't start it
# if --no-client is set.