Fix #2649 Allow ssl dir creation in --noop mode

Wrap Puppet::Settings.use in a block that disables noop mode during the
execution of the block and ensures that noop returns to its original
value afterwards. This allows internal puppet catalog operations like
ssl directory creation to occur even when puppet is run in --noop mode.
This should actually solve a broader class of related bugs.

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index e80c7cc8f..f2c513b29 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -157,6 +157,14 @@ class Puppet::Util::Settings
         set_value(str, value, :cli)
     end
 
+    def without_noop
+        old_noop = value(:noop,:cli)
+        set_value(:noop, false, :cli)
+        yield
+    ensure
+        set_value(:noop, old_noop, :cli)
+    end
+
     def include?(name)
         name = name.intern if name.is_a? String
         @config.include?(name)
@@ -632,7 +640,7 @@ Generated on #{Time.now}.
                 return
             end
 
-            begin
+            without_noop do
                 catalog.host_config = false
                 catalog.apply do |transaction|
                     if transaction.any_failed?