lib/poolparty/base_packages/poolparty.rb in auser-poolparty-0.2.65 vs lib/poolparty/base_packages/poolparty.rb in auser-poolparty-0.2.66

@@ -39,26 +39,25 @@
           # , :ifnot => "/bin/ps aux | /bin/grep -q pm_node"
           # has_runit_service("pm_node", "pm_node", File.join(File.dirname(__FILE__), "..", "templates/messenger/node/"))
         end
         
         has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger")
-        has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node")
-        has_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts -n #{cloud.name}")
+        has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node")        
         
         # execute_on_node do
-        has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
-          requires get_gempackage("poolparty")
-          command "/usr/bin/puppetrunner"
-        end
-        has_cron(:name => "update_hosts", :user => Base.user, :minute => "0") do
-          command ". /etc/profile && server-update-hosts"
-        end
         has_remotefile(:name => "/usr/bin/puppetrunner") do
           mode 744
           template File.join(File.dirname(__FILE__), "..", "templates/puppetrunner")
         end
         
+        execute_on_node do
+          has_cron(:name => "node puppetd runner", :user => Base.user, :minute => "*/5") do
+            requires get_gempackage("poolparty")
+            command "/usr/bin/puppetrunner"
+          end
+        end
+        
         # end
         
         # Cloud panel setup
         
         # has_directory(:name => "/var/www/cloudpanel")
@@ -68,12 +67,14 @@
         # end
         
         # Custom run puppet to minimize footprint
         # TODO: Update the offsetted times
         execute_on_master do
-          has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
+          has_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts -n #{cloud.name}")
+          
+          has_cron(:name => "master puppetd runner", :user => Base.user, :minute => "*/15") do
             requires get_gempackage("poolparty")
-            command(PoolParty::Remote::RemoteInstance.puppet_master_rerun_command)
+            command(PoolParty::Remote::RemoteInstance.puppet_runner_command)
           end
           has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
             requires get_gempackage("poolparty")
             command(". /etc/profile && cloud-handle-load -n #{cloud.name}")
           end
\ No newline at end of file