Fixing #911 and #912 -- there's a default environment (development)

and you have to specify the valid environments for your site.

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index a3991bbaa..da830952a 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -127,10 +127,15 @@ module Puppet
             namespaces and methods.  This can be used as a coarse-grained
             authorization system for both ``puppetd`` and ``puppetmasterd``."
         ],
-        :environment => ["", "The environment Puppet is running in.  For clients (e.g., ``puppetd``) this
-            determines the environment itself, which is used to find modules and much more.  For
-            servers (i.e., ``puppetmasterd``) this provides the default environment for nodes we
-            know nothing about."],
+        :environments => ["production,development", "The valid environments for Puppet clients.
+            This is more useful as a server-side setting than client, but any
+            environment chosen must be in this list.  Values should be
+            separated by a comma."],
+        :environment => ["development", "The environment Puppet is running in.  For clients
+            (e.g., ``puppetd``) this determines the environment itself, which
+            is used to find modules and much more.  For servers (i.e.,
+            ``puppetmasterd``) this provides the default environment for nodes
+            we know nothing about."],
         :diff_args => ["", "Which arguments to pass to the diff command when printing differences between files."],
         :diff => ["diff", "Which diff command to use when printing differences between files."],
         :show_diff => [false, "Whether to print a contextual diff when files are being replaced.  The diff