summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorLuke Kanies <luke@reductivelabs.com>2010-03-25 14:55:51 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit2a60e1e5eef42a1a0f11574d69f3c90be22e52ca (patch)
treebf56971411d00fb8b6391f1140aa2ed2f8d378a1 /lib/puppet/application
parent626945bb33fa0b294100414c058a1f4d2b3e0039 (diff)
downloadpuppet-2a60e1e5eef42a1a0f11574d69f3c90be22e52ca.tar.gz
puppet-2a60e1e5eef42a1a0f11574d69f3c90be22e52ca.tar.xz
puppet-2a60e1e5eef42a1a0f11574d69f3c90be22e52ca.zip
Adding :catalog_terminus setting
This will rarely be used, but it enables even more architectural flexibility, such as precompiling catalogs and storing them in memcached or equivalent. With this setup, a single host can probably serve all catalogs and you would then just have as many compiling hosts as needed. Signed-off-by: Luke Kanies <luke@reductivelabs.com>
Diffstat (limited to 'lib/puppet/application')
-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