summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-06-01 21:17:47 -0500
committerJames Turnbull <james@lovedthanlost.net>2009-06-03 07:32:21 +1000
commit5522eb85a041d9ec77cf8c2b04f3351f48716246 (patch)
treebb29511df4f00218be939117facb3cb2e0ad545c /lib
parentabbb282211096780eea4efa461b2d7f958dc29ae (diff)
downloadpuppet-5522eb85a041d9ec77cf8c2b04f3351f48716246.tar.gz
puppet-5522eb85a041d9ec77cf8c2b04f3351f48716246.tar.xz
puppet-5522eb85a041d9ec77cf8c2b04f3351f48716246.zip
Disabling the catalog cache, so puppetqd is compatible with storeconfigs
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/application/puppetqd.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/puppet/application/puppetqd.rb b/lib/puppet/application/puppetqd.rb
index d5c0c7a45..f64d9b2a8 100644
--- a/lib/puppet/application/puppetqd.rb
+++ b/lib/puppet/application/puppetqd.rb
@@ -86,5 +86,11 @@ Puppet::Application.new(:puppetqd) do
Puppet::Resource::Catalog.terminus_class = :active_record
daemon.daemonize if Puppet[:daemonize]
+
+ # We want to make sure that we don't have a cache
+ # class set up, because if storeconfigs is enabled,
+ # we'll get a loop of continually caching the catalog
+ # for storage again.
+ Puppet::Node::Catalog.cache_class = nil
end
end