poolparty.rb in auser-poolparty-0.2.77

- old
+ new

@@ -66,10 +66,19 @@
         #   template File.join(File.dirname(__FILE__), "..", "templates/yaws.conf")
         # end
         
         # Custom run puppet to minimize footprint
         # TODO: Update the offsetted times
+        has_remotefile(:name => "/usr/bin/puppetrerun") do
+          mode 744
+          template File.join(File.dirname(__FILE__), "..", "templates/puppetrerun")
+        end
+        has_remotefile(:name => "/usr/bin/puppetcleaner") do
+          mode 744
+          template File.join(File.dirname(__FILE__), "..", "templates/puppetcleaner")
+        end
+        
         execute_on_master 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")
@@ -91,18 +100,9 @@
           has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master") #, :ifnot => "/bin/ps aux | /bin/grep -q pm_master"
           has_exec(:name => "start client server", :command => ". /etc/profile && server-start-client") #, :ifnot => "/bin/ps aux | /bin/grep -q client_server"
           
           has_cron({:name => "maintain script", :command => ". /etc/profile && cloud-maintain -n #{cloud.name}", :minute => "*/3", :requires => [get_gempackage("poolparty"), get_cron("puppetd runner"), get_cron("Load handler"), get_service("haproxy")]})
           
-          has_remotefile(:name => "/usr/bin/puppetcleaner") do
-            mode 744
-            template File.join(File.dirname(__FILE__), "..", "templates/puppetcleaner")
-          end
-          
-          has_remotefile(:name => "/usr/bin/puppetrerun") do
-            mode 744
-            template File.join(File.dirname(__FILE__), "..", "templates/puppetrerun")
-          end
         end        
         # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)
       end
       
     end  
\ No newline at end of file