This is just a simple call to Puppet.use in the puppetd
setup method.
Signed-off-by: Luke Kanies <[email protected]>
---
lib/puppet/application/puppetd.rb | 2 ++
spec/unit/application/puppetd.rb | 6 ++++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/lib/puppet/application/puppetd.rb
b/lib/puppet/application/puppetd.rb
index 1f97043..e27d388 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -211,6 +211,8 @@ Puppet::Application.new(:puppetd) do
Puppet::Util::Log.newdestination(logdest)
end
+ Puppet.settings.use :main, :puppetd, :ssl
+
# We need to specify a ca location for things to work, but
# until the REST cert transfers are working, it needs to
# be local.
diff --git a/spec/unit/application/puppetd.rb b/spec/unit/application/puppetd.rb
index 08f2a07..fffade5 100755
--- a/spec/unit/application/puppetd.rb
+++ b/spec/unit/application/puppetd.rb
@@ -265,6 +265,12 @@ describe "puppetd" do
@puppetd.run_setup
end
+ it "should use :main, :puppetd, and :ssl" do
+ Puppet.settings.expects(:use).with(:main, :puppetd, :ssl)
+
+ @puppetd.run_setup
+ end
+
it "should install a remote ca location" do
Puppet::SSL::Host.expects(:ca_location=).with(:remote)
--
1.6.1
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
