summaryrefslogtreecommitdiffstats
path: root/lib/puppet/indirector/code
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-10-08 19:12:39 -0500
committerLuke Kanies <luke@madstop.com>2007-10-08 19:12:39 -0500
commitd24c1ccc56b912e0ff69f7572dd36912c8c739c2 (patch)
treef86a02ae5845f1b7cb8327247356268a70e0948e /lib/puppet/indirector/code
parentfc9c850414baff17dc97b0184f34e58b4bec5785 (diff)
downloadpuppet-d24c1ccc56b912e0ff69f7572dd36912c8c739c2.tar.gz
puppet-d24c1ccc56b912e0ff69f7572dd36912c8c739c2.tar.xz
puppet-d24c1ccc56b912e0ff69f7572dd36912c8c739c2.zip
All tests should now pass again.
This is the first real pass towards using caching. The `puppet` executable actually uses the indirection work, instead of handlers and such (and man! is it cleaner). Most of this work was a result of trying to get the client-side story working, with correct yaml caching of configurations, which means this commit also covers converting configurations to yaml, which was a much bigger PITA than it needed to be. I still need to write integration tests, and I also need to cover the server-side story of a normal configuration retrieval.
Diffstat (limited to 'lib/puppet/indirector/code')
-rw-r--r--lib/puppet/indirector/code/configuration.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/puppet/indirector/code/configuration.rb b/lib/puppet/indirector/code/configuration.rb
index 2d8fedcc8..949926a3c 100644
--- a/lib/puppet/indirector/code/configuration.rb
+++ b/lib/puppet/indirector/code/configuration.rb
@@ -21,9 +21,13 @@ class Puppet::Indirector::Code::Configuration < Puppet::Indirector::Code
node = find_node(key)
end
- configuration = compile(node)
-
- return configuration
+ if configuration = compile(node)
+ return configuration.to_transportable
+ else
+ # This shouldn't actually happen; we should either return
+ # a config or raise an exception.
+ return nil
+ end
end
def initialize