diff options
| author | Luke Kanies <luke@madstop.com> | 2007-08-22 16:14:39 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-08-22 16:14:39 -0500 |
| commit | f1727f18ab933df9ecbecc2da8fad72eb441e0d5 (patch) | |
| tree | 4cf9e123dfa02a85489b38a73aa5a778525fedf5 /lib/puppet/network/handler | |
| parent | 4eb87ed7c8829a6fbc558595be9149e9b3cf5b36 (diff) | |
| download | puppet-f1727f18ab933df9ecbecc2da8fad72eb441e0d5.tar.gz puppet-f1727f18ab933df9ecbecc2da8fad72eb441e0d5.tar.xz puppet-f1727f18ab933df9ecbecc2da8fad72eb441e0d5.zip | |
Adding the topscope metadata to the configuration being returned to the client, just like it expects, and fixing how the resource handler calls the master type.
Diffstat (limited to 'lib/puppet/network/handler')
| -rwxr-xr-x | lib/puppet/network/handler/resource.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/handler/resource.rb b/lib/puppet/network/handler/resource.rb index ca492bd81..ac29dce53 100755 --- a/lib/puppet/network/handler/resource.rb +++ b/lib/puppet/network/handler/resource.rb @@ -26,7 +26,7 @@ class Puppet::Network::Handler # Apply a TransBucket as a transaction. def apply(bucket, format = "yaml", client = nil, clientip = nil) - unless @local + unless local? begin case format when "yaml": @@ -43,7 +43,7 @@ class Puppet::Network::Handler # Create a client, but specify the remote machine as the server # because the class requires it, even though it's unused - client = Puppet::Network::Client.client(:Master).new(:Server => client||"localhost") + client = Puppet::Network::Client.client(:Master).new(:Master => client||"localhost") # Set the objects client.objects = component |
