diff options
| author | Luke Kanies <luke@madstop.com> | 2008-10-17 09:01:04 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-10-17 09:01:04 -0500 |
| commit | 8aee40de69e6fe8d67ab58a2e223443b15820584 (patch) | |
| tree | 89e230df3b43302a542f2cb6869f63e2fb93f6d8 /lib/puppet/node.rb | |
| parent | 1b517d2fb048603bd1743a662bde74e8ae4b13dc (diff) | |
| parent | a74ec60d33dee1c592ec858faeccc23d7a7b79f3 (diff) | |
| download | puppet-8aee40de69e6fe8d67ab58a2e223443b15820584.tar.gz puppet-8aee40de69e6fe8d67ab58a2e223443b15820584.tar.xz puppet-8aee40de69e6fe8d67ab58a2e223443b15820584.zip | |
Merge branch '0.24.x' Removed the 'after' blocks that call Type.clear,
since that method is deprecated.
Conflicts:
CHANGELOG
bin/puppetca
lib/puppet/file_serving/fileset.rb
lib/puppet/network/xmlrpc/client.rb
lib/puppet/type/file/selcontext.rb
spec/unit/file_serving/metadata.rb
spec/unit/type/file.rb
Diffstat (limited to 'lib/puppet/node.rb')
| -rw-r--r-- | lib/puppet/node.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb index 77f1f0780..9650562d4 100644 --- a/lib/puppet/node.rb +++ b/lib/puppet/node.rb @@ -15,12 +15,7 @@ class Puppet::Node attr_accessor :name, :classes, :parameters, :source, :ipaddress attr_reader :time - - # Set the environment, making sure that it's valid. - def environment=(value) - raise(ArgumentError, "Invalid environment %s" % value) unless Puppet::Node::Environment.valid?(value) - @environment = value - end + attr_writer :environment # Do not return environments that are the empty string, and use # explicitly set environments, then facts, then a central env @@ -28,7 +23,6 @@ class Puppet::Node def environment unless @environment if env = parameters["environment"] - raise(ArgumentError, "Invalid environment %s from parameters" % env) unless Puppet::Node::Environment.valid?(env) @environment = env else @environment = Puppet::Node::Environment.new.name.to_s |