diff options
| author | Luke Kanies <luke@madstop.com> | 2007-09-12 15:32:25 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-09-12 15:32:25 -0500 |
| commit | a6fe70054f4fb3efe4d558ffdd244917ca1c6f9c (patch) | |
| tree | 6b8dbf7f3f2779254174b0829412a5365ad6ebed /lib/puppet/network/handler/configuration.rb | |
| parent | 1459c507ddccff2a2a6fbadd4c880c023b5e9893 (diff) | |
| download | puppet-a6fe70054f4fb3efe4d558ffdd244917ca1c6f9c.tar.gz puppet-a6fe70054f4fb3efe4d558ffdd244917ca1c6f9c.tar.xz puppet-a6fe70054f4fb3efe4d558ffdd244917ca1c6f9c.zip | |
Another intermediate commit. The node and fact classes are now functional and are used instead of the network handlers, which have been removed. There are some failing tests as a result, but I want to get this code committed before I massage the rest of the system to make it work again.
Diffstat (limited to 'lib/puppet/network/handler/configuration.rb')
| -rw-r--r-- | lib/puppet/network/handler/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/handler/configuration.rb b/lib/puppet/network/handler/configuration.rb index 372e80325..2df1b3ab4 100644 --- a/lib/puppet/network/handler/configuration.rb +++ b/lib/puppet/network/handler/configuration.rb @@ -79,7 +79,7 @@ class Puppet::Network::Handler # Add any extra data necessary to the node. def add_node_data(node) # Merge in our server-side facts, so they can be used during compilation. - node.fact_merge(@server_facts) + node.merge(@server_facts) # Add any specified classes to the node's class list. if classes = @options[:Classes] |