summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorLuke Kanies <luke@reductivelabs.com>2010-03-25 14:55:51 -0700
committerJames Turnbull <james@lovedthanlost.net>2010-03-27 14:32:07 +1100
commit7018cf5634bcbdcc167d5fbe5560801a2a131ca9 (patch)
tree140ad6afb19c3f23cb92f5b234ac6694af0ed288 /lib/puppet/application
parent978ab8a9a1f1c7ea23698543bf86f587ae88e6c4 (diff)
downloadpuppet-7018cf5634bcbdcc167d5fbe5560801a2a131ca9.tar.gz
puppet-7018cf5634bcbdcc167d5fbe5560801a2a131ca9.tar.xz
puppet-7018cf5634bcbdcc167d5fbe5560801a2a131ca9.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/puppetd.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index fe111867d..8b07c90dd 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -211,7 +211,10 @@ Puppet::Application.new(:puppetd) 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