Fixing #2237 - client_yaml dir is always created by puppetd

This is just a simple call to Puppet.use in the puppetd
setup method.

Signed-off-by: Luke Kanies <luke@madstop.com>

2 files changed, 8 insertions, 0 deletions

diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index 83bb65691..17b07d98e 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 18caa9e86..d34ec9f2f 100755
--- a/spec/unit/application/puppetd.rb
+++ b/spec/unit/application/puppetd.rb
@@ -282,6 +282,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)