diff options
| author | Rick Bradley <rick@rickbradley.com> | 2007-10-09 11:29:13 -0500 |
|---|---|---|
| committer | Rick Bradley <rick@rickbradley.com> | 2007-10-09 11:29:13 -0500 |
| commit | fdfe807bd986a2b27f0dfd0cecde1a33aeee309b (patch) | |
| tree | 0b6375bdefa041a7d4fbab9745ed084fb025bc30 /bin | |
| parent | 42b98562b5237797e1a51fdcdd57aa3c6825b404 (diff) | |
| parent | 01f132d8b88467dfd314ad355f1cdf9f546945b3 (diff) | |
| download | puppet-fdfe807bd986a2b27f0dfd0cecde1a33aeee309b.tar.gz puppet-fdfe807bd986a2b27f0dfd0cecde1a33aeee309b.tar.xz puppet-fdfe807bd986a2b27f0dfd0cecde1a33aeee309b.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet into routing
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 39802f229..b782969a8 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 = { |