Adding support for only using cached catalogs

This basically allows a sysadmin to control when a client
will compile a new catalog - with this option enabled,
the client will use the cached catalog as long as it has
one, only recompiling when run with the option disabled.

Signed-off-by: Luke Kanies <luke@reductivelabs.com>

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index 3b4f9ec90..797d93456 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -100,7 +100,7 @@ class Puppet::Configurer
         fact_options = facts_for_uploading()
 
         # First try it with no cache, then with the cache.
-        unless result = retrieve_new_catalog(fact_options)
+        unless (Puppet[:use_cached_catalog] and result = retrieve_catalog_from_cache(fact_options)) or result = retrieve_new_catalog(fact_options)
             if ! Puppet[:usecacheonfailure]
                 Puppet.warning "Not using cache on failed catalog"
                 return nil
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 2f397f495..c67e9efd7 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -561,6 +561,10 @@ module Puppet
             new configurations, where you want to fix the broken configuration
             rather than reverting to a known-good one."
         ],
+        :use_cached_catalog => [false,
+            "Whether to only use the cached catalog rather than compiling a new catalog
+            on every run.  Puppet can be run with this enabled by default and then selectively
+            disabled when a recompile is desired."],
         :ignorecache => [false,
             "Ignore cache and always recompile the configuration.  This is
             useful for testing new configurations, where the local cache may in