summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-08-07 18:40:30 -0700
committerLuke Kanies <luke@madstop.com>2008-08-07 18:40:30 -0700
commit62202bf55723096d05a61efefae46ee98a2948dd (patch)
treef5bec9abaf14ecd675d99d78cef74ab16810b92e
parent86a718856f4ca3c67450159645307b3c542db799 (diff)
downloadpuppet-62202bf55723096d05a61efefae46ee98a2948dd.tar.gz
puppet-62202bf55723096d05a61efefae46ee98a2948dd.tar.xz
puppet-62202bf55723096d05a61efefae46ee98a2948dd.zip
Adding 'require' statements as necessary for Puppet::SSL to work.
Signed-off-by: Luke Kanies <luke@madstop.com>
-rw-r--r--lib/puppet.rb2
-rw-r--r--lib/puppet/ssl.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb
index e33f30ced..c3095f02e 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -372,9 +372,11 @@ end
require 'puppet/type'
require 'puppet/network'
+require 'puppet/ssl'
require 'puppet/module'
require 'puppet/util/storage'
require 'puppet/parser/interpreter'
+
if Puppet[:storeconfigs]
require 'puppet/rails'
end
diff --git a/lib/puppet/ssl.rb b/lib/puppet/ssl.rb
index 68c65ca80..1a3e8d13d 100644
--- a/lib/puppet/ssl.rb
+++ b/lib/puppet/ssl.rb
@@ -3,4 +3,5 @@ require 'puppet'
require 'openssl'
module Puppet::SSL # :nodoc:
+ require 'puppet/ssl/host'
end