lib/poolparty/base_packages/poolparty.rb in auser-poolparty-0.2.58 vs lib/poolparty/base_packages/poolparty.rb in auser-poolparty-0.2.59

@@ -4,13 +4,14 @@
       
       def enable                
         # Build hostsfile
         # TODO: COME BACK AND CLEAN THIS UP
         (self.respond_to?(:list_of_running_instances) ? self : parent).list_of_running_instances.each do |ri|
-          has_host({:name => "gen_#{ri.name}", :ip => ri.ip, :alias => "#{ri.name}" })
+          has_host({:name => "#{ri.name}", :ip => ri.ip})
         end
-        has_host({:alias => "$hostname", :name => "$hostname", :ip => "localhost"})
+
+        # has_host({:name => "$hostname", :ip => "127.0.0.1", :alias => "localhost"})
         
         has_package(:name => "erlang")
         has_package(:name => "erlang-dev")
         has_package(:name => "erlang-src")
         # has_package(:name => "yaws")
@@ -48,11 +49,11 @@
         end
         
         # execute_on_node do
         has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
           requires get_gempackage("poolparty")
-          command(PoolParty::Remote::RemoteInstance.puppet_rerun_commad)
+          command "/usr/bin/puppetrun"
         end
         # end
         
         # Cloud panel setup
         
@@ -94,9 +95,13 @@
         end        
         
         has_remotefile(:name => "/usr/bin/puppetrerun") do
           mode 744
           template File.join(File.dirname(__FILE__), "..", "templates/puppetrerun")
+        end
+        has_remotefile(:name => "/usr/bin/puppetrunner") do
+          mode 744
+          template File.join(File.dirname(__FILE__), "..", "templates/puppetrunner")
         end
         
         # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)
       end
       
\ No newline at end of file