diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 14:26:49 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-12 14:26:49 -0700 |
| commit | 704623cb95aacb0544609620994dc36f61a4b463 (patch) | |
| tree | 6706dc7afa05bf4bbffb2ab7e616717fb6af0c86 /lib/puppet/node.rb | |
| parent | 9d73b73594d4bf9fe4e8abb369ffc5887b15f4ec (diff) | |
| parent | c21539fe2205fc61ca9e0a49b3b2702e76931632 (diff) | |
| download | puppet-704623cb95aacb0544609620994dc36f61a4b463.tar.gz puppet-704623cb95aacb0544609620994dc36f61a4b463.tar.xz puppet-704623cb95aacb0544609620994dc36f61a4b463.zip | |
Merge branch '2.7.next' into next
Diffstat (limited to 'lib/puppet/node.rb')
| -rw-r--r-- | lib/puppet/node.rb | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb index 4bd4d1de6..5b0a98615 100644 --- a/lib/puppet/node.rb +++ b/lib/puppet/node.rb @@ -20,29 +20,6 @@ class Puppet::Node attr_accessor :name, :classes, :source, :ipaddress, :parameters attr_reader :time - def self.from_pson(pson) - raise ArgumentError, "No name provided in pson data" unless name = pson['name'] - - node = new(name) - node.classes = pson['classes'] - node.parameters = pson['parameters'] - node.environment = pson['environment'] - node - end - - def to_pson(*args) - result = { - 'document_type' => "Puppet::Node", - 'data' => {} - } - result['data']['name'] = name - result['data']['classes'] = classes unless classes.empty? - result['data']['parameters'] = parameters unless parameters.empty? - result['data']['environment'] = environment.name - - result.to_pson(*args) - end - def environment return super if @environment |