Removed the loglevels from the valid values for 'logoutput'

in the Exec resource type -- the log levels are specified
using the 'loglevel' parameter, not 'logoutput'.  This never
worked, or at least hasn't for ages, and now the docs are
just correct.

3 files changed, 9 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 234b24393..a82fd567a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+    Removed the loglevels from the valid values for 'logoutput'
+    in the Exec resource type -- the log levels are specified
+    using the 'loglevel' parameter, not 'logoutput'.  This never
+    worked, or at least hasn't for ages, and now the docs are
+    just correct.
+
     Somewhat refactored fileserving so that it no longer caches
     any objects, nor does it use Puppet's RAL resources.  In the
     process, I fixed #894 (you can now copy links) and refactored
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index f8049236f..2772b54a8 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -211,10 +211,7 @@ module Puppet
                 log the output when the command reports an error.  Values are
                 **true**, *false*, *on_failure*, and any legal log level."
 
-            values = [:true, :false, :on_failure]
-            # And all of the log levels
-            Puppet::Util::Log.eachlevel { |level| values << level }
-            newvalues(*values)
+            newvalues(:true, :false, :on_failure)
         end
 
         newparam(:refresh) do
diff --git a/test/ral/types/exec.rb b/test/ral/types/exec.rb
index 4133d8519..e2a3dd9ed 100755
--- a/test/ral/types/exec.rb
+++ b/test/ral/types/exec.rb
@@ -394,8 +394,8 @@ class TestExec < Test::Unit::TestCase
         assert_apply(exec)
 
         assert_nothing_raised {
-            exec[:command] = "echo logoutput is warning"
-            exec[:logoutput] = "warning"
+            exec[:command] = "echo logoutput is on_failure"
+            exec[:logoutput] = "on_failure"
         }
 
         assert_apply(exec)