diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-08 19:12:39 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-08 19:12:39 -0500 |
| commit | d24c1ccc56b912e0ff69f7572dd36912c8c739c2 (patch) | |
| tree | f86a02ae5845f1b7cb8327247356268a70e0948e /bin | |
| parent | fc9c850414baff17dc97b0184f34e58b4bec5785 (diff) | |
| download | puppet-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 'bin')
| -rwxr-xr-x | bin/puppet | 2 | ||||
| -rwxr-xr-x | bin/puppetmasterd | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bin/puppet b/bin/puppet index b004111c9..e4e3dd309 100755 --- a/bin/puppet +++ b/bin/puppet @@ -203,7 +203,7 @@ begin config = Puppet::Node::Configuration.find(node) # Translate it to a RAL configuration - config = config.extract_to_transportable.to_configuration + config = config.to_ral # And apply it config.apply diff --git a/bin/puppetmasterd b/bin/puppetmasterd index f764b1901..643076659 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -186,6 +186,9 @@ end Puppet.genconfig Puppet.genmanifest +# A temporary solution, to at least make the master work for now. +Puppet::Node::Facts.terminus_class = :yaml + require 'etc' handlers = { |