Fixing a problem that occurs when puppetd starts with an up-to-date configuration -- the default schedules and filebucket were not being created.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2115 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 11 insertions, 6 deletions

diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb
index 261119bfa..4fe78df11 100644
--- a/lib/puppet/client/master.rb
+++ b/lib/puppet/client/master.rb
@@ -270,12 +270,6 @@ class Puppet::Client::MasterClient < Puppet::Client
         end
         @objects = nil
 
-        # First create the default scheduling objects
-        Puppet::Type.type(:schedule).mkdefaultschedules
-        
-        # And filebuckets
-        Puppet::Type.type(:filebucket).mkdefaultbucket
-
         # Now convert the objects to real Puppet objects
         @objects = objects.to_type
 
@@ -317,6 +311,17 @@ class Puppet::Client::MasterClient < Puppet::Client
         else
             raise ArgumentError, "Configuration timeout must be an integer"
         end
+
+        mkdefault_objects
+    end
+
+    # Make the default objects necessary for function.
+    def mkdefault_objects
+        # First create the default scheduling objects
+        Puppet::Type.type(:schedule).mkdefaultschedules
+        
+        # And filebuckets
+        Puppet::Type.type(:filebucket).mkdefaultbucket
     end
 
     # Mark that we should restart.  The Puppet module checks whether we're running,