diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-28 14:49:32 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-28 14:49:32 -0600 |
| commit | 82b02b90493f0abc173ec4cc09948106ae5190cd (patch) | |
| tree | 407fc6424353f343aaceed2462023c4b2f3e404d | |
| parent | fe1f4f57bf5ee0792ee645ec8e0bfddf455ea1e3 (diff) | |
| download | puppet-82b02b90493f0abc173ec4cc09948106ae5190cd.tar.gz puppet-82b02b90493f0abc173ec4cc09948106ae5190cd.tar.xz puppet-82b02b90493f0abc173ec4cc09948106ae5190cd.zip | |
Fixing #1101 -- puppetrun works again.
| -rwxr-xr-x | bin/puppetrun | 7 | ||||
| -rw-r--r-- | lib/puppet/network/client.rb | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/bin/puppetrun b/bin/puppetrun index c92b59fc6..d0823b9c5 100755 --- a/bin/puppetrun +++ b/bin/puppetrun @@ -274,12 +274,7 @@ else end # Now parse the config -config = File.join(Puppet[:confdir], "puppet.conf") -Puppet.parse_config(config) - -if File.exists? config - Puppet.settings.parse(config) -end +Puppet.parse_config if Puppet[:node_terminus] = "ldap" if options[:all] diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb index 0a0a72345..cf1782f79 100644 --- a/lib/puppet/network/client.rb +++ b/lib/puppet/network/client.rb @@ -7,6 +7,8 @@ require 'puppet/util/subclass_loader' require 'puppet/util/methodhelper' require 'puppet/sslcertificates/support' +require 'puppet/network/handler' + require 'net/http' # Some versions of ruby don't have this method defined, which basically causes |