auser-poolparty 0.2.37 → 0.2.38

data/Manifest.txt

@@ -33,6 +33,7 @@ bin/server-get-load
 bin/server-list-active
 bin/server-list-responding
 bin/server-rerun
+bin/server-show-stats
 bin/server-start-master
 bin/server-start-node
 config/hoe.rb

data/bin/cloud-add-keypair

@@ -15,8 +15,8 @@ include Remote
 
 @clouds.each do |name, cloud|
   
-  with_cloud(cloud, {:location => @location}) do
-    logger.info header("Creating keypair for #{name}")
+  with_cloud(cloud, {:location => @location, :verbose => o.verbose}) do
+    vputs header("Creating keypair for #{name}")
     create_keypair unless testing
   end  
   

data/bin/cloud-maintain

@@ -18,19 +18,18 @@ include Remote
 
 @clouds.each do |name, cloud|
 
-  with_cloud(cloud, {:location => @location, :testing => o.testing}) do
-    logger.info header("Maintaining cloud #{name}")
+  with_cloud(cloud, {:location => @location, :testing => o.testing, :verbose => o.verbose}) do
+    vputs header("Maintaining cloud #{name}")
     if !minimum_number_of_instances_are_running?
-      logger.warn "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
-      logger.warn "Launching new instance"
-      expand_cloud_if_necessary( !testing )
+      vputs "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
+      vputs "Launching new instance"
     elsif !maximum_number_of_instances_are_not_running?
-      logger.warn "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
-      logger.warn "Shutting down non-master instance"
-      contract_cloud_if_necessary( !testing )
-    else
-      logger.info "Cloud is maintained"
-    end    
+      vputs "#{list_of_running_instances.size} running instances of between #{minimum_instances} and #{maximum_instances}"
+      vputs "Shutting down non-master instance"
+    end
+    vputs "Cloud is maintained"
+    expand_cloud_if_necessary( !testing )
+    contract_cloud_if_necessary( !testing )    
   end  
 
 end

data/bin/cloud-provision

@@ -4,7 +4,7 @@ require "poolparty"
 require "poolpartycl"
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-s', '--slave', 'Provision slave (default: false)')    { optioner.provision_slave true }
-  opts.on('-i num', '--id num', 'Instance num to provision')    { |i| optioner.num i }
+  opts.on('-i num', '--id num', 'Instance num to provision')    { |i| optioner.instance_num i }
 end
 
 load_pool(o.spec || Binary.get_existing_spec_location)
@@ -12,13 +12,14 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 include Remote
 
 @clouds = extract_cloud_from_options o
-@instance_num = o.num.to_i || nil
 
 @clouds.each do |cloud|
 
-  with_cloud(cloud, {:verbose => o.verbose, :testing => o.testing, :provision_slave => (o.provision_slave || false), :instance_num => @instance_num}) do
+  with_cloud(cloud, {:verbose => o.verbose, :testing => o.testing, :provision_slave => (o.provision_slave || false), :instance_number => o.instance_num}) do
+
+    instance_num = instance_number.to_i if instance_number
     
-    if instance_num      
+    if instance_num
       @instance = get_instance_by_number( instance_num )
       vputs "Provisioning instance: #{@instance.name} (#{instance_num})"
       Provisioner.provision_slave(@instance, self, testing)

data/bin/messenger-get-load

@@ -18,9 +18,10 @@ include Remote
 
 @clouds.each do |cl|
   
-  with_cloud(cl, {:testing => o.testing, :monitorname => @monitor }) do
+  with_cloud(cl, {:testing => o.testing, :monitorname => @monitor, :verbose => o.verbose }) do
     vputs "Getting #{monitorname} load through the messenger"
-    print PoolParty::Messenger.messenger_send!("get_load #{monitorname}", testing)
+    load = PoolParty::Messenger.messenger_send!("get_load #{monitorname}", testing)
+    load =~ /[0-9\.]+/ ? print load : vputs "-1"
   end
   
 end

data/bin/server-show-stats

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+available_monitors = PoolParty::Monitors.available_monitors
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+end
+
+load_pool(o.spec || Binary.get_existing_spec_location)
+
+include Remote
+
+@clouds = extract_cloud_from_options o
+
+@clouds.each do |cloud|
+  
+  with_cloud(cloud, {:testing => o.testing }) do    
+    puts rules_values
+  end  
+  
+end

data/lib/erlang/messenger/src/utils.erl

@@ -32,7 +32,7 @@ end.
 average_for_list(Num, L) ->
 	case length(L) of
 		0 ->
-			0;
+			-1;
 		_ ->
 			Num / length(L)
 	end.

data/lib/erlang/messenger/useful_snippets

@@ -4,3 +4,11 @@
 % Start test nodes, defining testing
 % erl -pa ./ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -setcookie poolparty -boot pm_node_rel-0.1 -sname node0
 % erl -pa ./ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -setcookie poolparty -boot pm_node_rel-0.1 -sname node1
+
+% Starting the client on the master
+% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.37/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start
+
+% Get the load
+% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.38/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start -run pm_client get_load cpu -run erlang init stop
+
+% cd /var/poolparty && gem uninstall poolparty && wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true -O poolparty-latest.gem 2>&1 && gem install --no-ri --no-rdoc poolparty-latest.gem

data/lib/poolparty/aska/aska.rb

@@ -14,6 +14,7 @@ module Aska
           
           create_instance_variable(k)
           rs << {k => [m, v]}
+          rs << {k => [">", "0"]} unless rs.reject {|a| a.to_s == "#{k}>0" }
         end
         self.send(:define_method, name) do
           look_up_rules(name)
@@ -66,6 +67,18 @@ module Aska
         end
       end
     end
+    def rules_values
+      returning Array.new do |arr|
+        self.class.defined_rules.each do |name,rule_array|
+          arr << name
+          rule_array.each do |rule|
+            rule.map do |k,v|
+              arr << "#{k} -> #{__aska_aska_stuff(k)} (#{v[0]} #{v[1]})"
+            end
+          end
+        end
+      end.join("\n")
+    end
     # Get the variable from the class
     # If it's defined as an attr_accessor, we know it has been defined as a rule
     # Otherwise, if we are passing it as a 

data/lib/poolparty/base_packages/haproxy.rb

@@ -3,43 +3,36 @@ module PoolParty
     plugin :haproxy do
       
       def enable
-        execute_if("$hostname", "master") do
+        execute_on_master do
           package({:name => "haproxy"})
 
-          # Startup haproxy and enable it
-          has_line_in_file("ENABLED=1", "/etc/default/haproxy")
-          has_line_in_file("SYSLOGD=\"-r\"", "/etc/default/syslogd")
-          has_line_in_file("local0.* /var/log/haproxy.log", "/etc/syslog.conf", {:notify => 'Service["sysklogd"]'})
-
           # Restart sysklogd after we update the haproxy.log
           has_service(:name => "sysklogd") do
             ensures "running"
           end
+          
+          # Template variables
+          has_variable(:name => "name_haproxy", :value => "#{cloud.name}")          
+          has_variable(:name => "nodenames_haproxy", :value => "generate('/usr/bin/env', '/var/lib/gems/1.8/bin/server-list-active', '-c', 'name')")
+          has_variable(:name => "node_ips_haproxy",  :value => "generate('/usr/bin/env', '/var/lib/gems/1.8/bin/server-list-active', '-c', 'ip')")
+          
+          has_variable(:name => "ports_haproxy", :value => ([(self.respond_to?(:port) ? port : Base.port)].flatten))        
+          has_variable(:name => "forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Base.forwarding_port))
+          has_variable(:name => "proxy_mode", :value => (respond_to?(:proxy_mode) ? proxy_mode : Base.proxy_mode))
+          
+          # Startup haproxy and enable it
+          has_line_in_file("ENABLED=1", "/etc/default/haproxy")
+          has_line_in_file("SYSLOGD=\"-r\"", "/etc/default/syslogd")
+          has_line_in_file("local0.* /var/log/haproxy.log", "/etc/syslog.conf", {:notify => get_service("sysklogd")})
 
           # Service is required
           has_service(:name => "haproxy", :ensures => "running")
 
-          # Tempalte variables
-          variable(:name => "name_haproxy", :value => "#{cloud.name}")
-          
-          # if cloud.provisioning?
-          #   variable(:name => "nodenames_haproxy", :value => "#{list_of_running_instances.map{|a| "#{a.send :name}" }.join("\t")}")
-          #   variable(:name => "node_ips_haproxy",  :value => "#{list_of_running_instances.map{|a| "#{a.send :ip}" }.join("\t")}")
-          # else
-            variable(:name => "nodenames_haproxy", :value => "generate('/usr/bin/env', '/var/lib/gems/1.8/bin/server-list-active', '-c', 'name')")
-            variable(:name => "node_ips_haproxy",  :value => "generate('/usr/bin/env', '/var/lib/gems/1.8/bin/server-list-active', '-c', 'ip')")
-          # end
-          
-          variable(:name => "ports_haproxy", :value => ([(self.respond_to?(:port) ? port : Base.port)].flatten))        
-          variable(:name => "forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Base.forwarding_port))
-          variable(:name => "proxy_mode", :value => (respond_to?(:proxy_mode) ? proxy_mode : Base.proxy_mode))
-
           # These can also be passed in via hash
           has_remotefile(:name => "/etc/haproxy.cfg") do
             mode 644
-            # onlyif '$hostname == "master"'
-            requires 'Package["haproxy"]'
-            notify 'Service["haproxy"]'
+            requires get_package("haproxy")
+            notify get_service("haproxy")
             template File.join(File.dirname(__FILE__), "..", "templates/haproxy.conf")
           end
         end

data/lib/poolparty/base_packages/poolparty.rb

@@ -3,6 +3,12 @@ module PoolParty
     plugin :poolparty do
       
       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 => "#{ri.name}", :ip => ri.ip })
+        end
+        
         has_package(:name => "erlang")
         has_package(:name => "erlang-dev")
         has_package(:name => "erlang-src")
@@ -32,39 +38,41 @@ module PoolParty
  
           has_gempackage(:name => "RubyInline", :download_url => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem")
           
-          has_gempackage(:name => "poolparty", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("ParseTree")])
+          has_gempackage(:name => "poolparty-latest", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("ParseTree")])
           
-          has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty"))
-          has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"))
+          has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty-latest"), :ifnot => "ps aux | grep beam | grep node")
+          has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"), :ifnot => "ps aux | grep beam | grep node")
           
         end
-                
-        # 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 => "#{ri.name}", :ip => ri.ip })
-        end
         
         # Custom run puppet to minimize footprint
         # TODO: Update the offsetted times
-        has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/8") do
-          command((self.respond_to?(:master) ? self : parent).master.puppet_runner_command)
+        execute_on_master do          
+          has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
+            command(PoolParty::Remote::RemoteInstance.puppet_master_rerun_command)
+          end
+        end
+        execute_on_node do
+          has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
+            command(PoolParty::Remote::RemoteInstance.puppet_rerun_commad)
+          end
         end
         
         # These are all requirements on the master
-        execute_if("$hostname", "master") do
-          has_cron({:name => "maintain script ", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3"})
+        execute_on_master do
+          has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3"})
           # TODO: Update this so it only runs when needed
-          has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty"), get_exec("build_messenger")])
+          has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger")], :ifnot => "ps aux | grep beam | grep node")
           
           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_remotefile(:name => "/usr/bin/puppetrerun") do
+          mode 744
+          template File.join(File.dirname(__FILE__), "..", "templates/puppetrerun")
         end
         
         # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)

data/lib/poolparty/core/object.rb

@@ -31,7 +31,7 @@ class Object
       v
     else
       vs = v.to_s.to_sym
-      respond_to?(vs) ? self.send(vs, *args) : v
+      respond_to?(vs) ? self.send(vs, *args) : v rescue v
     end
   end
   def to_option_string

data/lib/poolparty/helpers/provisioner_base.rb

@@ -10,7 +10,6 @@ module PoolParty
     # Convenience method to clean 
     def self.provision_master(cloud, testing=false)
       Provisioner::Master.new(cloud).process_install!(testing)
-      process_clean_reconfigure_for!(cloud.master, cloud, testing)
     end
 
     def self.configure_master(cloud, testing=false)
@@ -29,7 +28,6 @@ module PoolParty
 
     def self.configure_slaves(cloud, testing=false)
       cloud.nonmaster_nonterminated_instances.each do |sl|
-        puts "Slave: #{sl.name} (#{sl.ip})"
         configure_slave(sl, cloud, testing)
       end
     end
@@ -65,10 +63,14 @@ module PoolParty
       # Callback after initialized
       def loaded(opts={}, parent=self)      
       end
+      
+      ### Installation tasks
+      
       # This is the actual runner for the installation    
       def install
         valid? ? install_string : error
       end
+      # Write the installation tasks to a file in the storage directory
       def write_install_file
         error unless valid?
         ::FileUtils.mkdir_p Base.storage_directory unless ::File.exists?(Base.storage_directory)
@@ -88,16 +90,16 @@ module PoolParty
           vputs "Logging on to #{@instance.ip} (#{@instance.name})"
           @cloud.rsync_storage_files_to(@instance)
           vputs "Preparing configuration on the master"
-          process_clean_reconfigure_for!(@instance)
           
           before_install(@instance)
           
           vputs "Logging in and running provisioning on #{@instance.name}"
-          cmd = "cd #{Base.remote_storage_path} && chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh && rm install_#{name}.sh"
+          cmd = "cd #{Base.remote_storage_path} && chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh; rm install_#{name}.sh"
           verbose ? @cloud.run_command_on(cmd, @instance) : hide_output {@cloud.run_command_on(cmd, @instance)}
           
-          process_clean_reconfigure_for!(@instance)
-          after_install(@instance)          
+          process_clean_reconfigure_for!(@instance, testing)
+          
+          after_install(@instance)
         end
       end
       # Install callbacks
@@ -106,6 +108,9 @@ module PoolParty
       end
       def after_install(instance)        
       end
+      
+      ### Configuraton tasks
+      
       def configure
         valid? ? configure_string : error
       end
@@ -122,25 +127,23 @@ module PoolParty
         unless testing
           vputs "Logging on to #{@instance.ip}"
           @cloud.rsync_storage_files_to(@instance)
-          process_clean_reconfigure_for!(@instance)
 
           cmd = "cd #{Base.remote_storage_path} && chmod +x configure_#{name}.sh && /bin/sh configure_#{name}.sh && rm configure_#{name}.sh"
           verbose ? @cloud.run_command_on(cmd, @instance) : hide_output {@cloud.run_command_on(cmd, @instance)}
-          process_clean_reconfigure_for!(@instance)
         end
       end
       def process_clean_reconfigure_for!(instance, testing=false)
         vputs "Cleaning certs from master: #{instance.name}"
         # puppetca --clean #{instance.name}.compute-1.internal; puppetca --clean #{instance.name}.ec2.internal
         # find /etc/puppet/ssl -type f -exec rm {} \;
-        command = <<-EOE
-if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; fi
-        EOE
-        @cloud.run_command_on(command, @cloud.master) unless testing
+        command = instance.master? ?  "if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; fi" : "rm -rf /etc/puppet/ssl"
+        @cloud.run_command_on(command, instance) unless testing
       end
       def process_reconfigure!(testing=false)        
         @cloud.run_command_on(RemoteInstance.puppet_runner_command, @instance) unless testing
       end
+      # Tasks that need to be performed everytime we do any
+      # remote ssh'ing into any instance
       def setup_runner(force=false)
         @cloud.prepare_to_configuration
         @cloud.build_and_store_new_config_file(force)

data/lib/poolparty/helpers/provisioners/master.rb

@@ -24,6 +24,7 @@ module PoolParty
           setup_fileserver,
           setup_autosigning,
           install_poolparty,
+          setup_poolparty,
           start_puppetmaster
         ] << configure_tasks
       end
@@ -77,48 +78,23 @@ mkdir -p /etc/poolparty
 echo "*" > /etc/puppet/autosign.conf
         EOS
       end
-
-      def create_local_node
-        str = <<-EOS
-node default {
-  include poolparty
-}
-        EOS
-         @cloud.list_of_running_instances.each do |ri|
-           str << <<-EOS           
-node "#{ri.name}" inherits default {}
-           EOS
-         end
-"echo '#{str}' > /etc/puppet/manifests/nodes/nodes.pp"
-      end
-
-      def move_templates
-        <<-EOS
-mkdir -p #{Base.template_path}
-cp #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path}
-        EOS
-      end
       
-      def create_poolparty_manifest
+      def setup_poolparty
         <<-EOS
-cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
 cp #{Base.remote_storage_path}/#{Base.key_file_locations.first} "#{Base.base_config_directory}/.ppkeys"
 cp #{Base.remote_storage_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/#{Base.default_specfile_name}
-#{copy_ssh_app}
         EOS
       end
-      
+            
       def copy_ssh_app
-        if @cloud.remote_keypair_path != "#{Base.remote_storage_path}/#{@cloud.full_keypair_name}"
-          "cp #{Base.remote_storage_path}/#{@cloud.full_keypair_name} #{@cloud.remote_keypair_path}"
-        end
+        "cp #{Base.remote_storage_path}/#{@cloud.full_keypair_name} #{@cloud.remote_keypair_path}" if @cloud.remote_keypair_path != "#{Base.remote_storage_path}/#{@cloud.full_keypair_name}"
       end
       
       def install_poolparty
         <<-EOE
 cd /var/poolparty
 wget http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem -O logging.gem 2>&1
-wget http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem -O zentest.gem 2>&1
+wget http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem -O ZenTest.gem 2>&1
 wget http://rubyforge.org/frs/download.php/45600/ParseTree-3.0.1.gem -O ParseTree.gem 2>&1
 wget http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem -O ruby2ruby.gem 2>&1
 wget http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem -O activesupport.gem 2>&1
@@ -131,11 +107,11 @@ wget http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem -O rubyforg
 wget http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem -O rake.gem 2>&1
 wget http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem -O sexp_processor.gem 2>&1
 wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true -O poolparty-latest.gem 2>&1
-wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-ec2.gem 2>&1
+wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O grempe-amazon-ec2.gem 2>&1
 
 #{
-  %w(rake lockfile rubyforge hoe zentest sexp_processor flexmock logging activesupport 
-      RubyInline ParseTree ruby2ruby xml-simple poolparty-latest amazon-ec2).map do |dep|
+  %w(rake lockfile rubyforge hoe ZenTest sexp_processor flexmock logging activesupport 
+      RubyInline ParseTree ruby2ruby xml-simple poolparty-latest grempe-amazon-ec2).map do |dep|
     "gem install --ignore-dependencies -y --no-ri --no-rdoc #{dep}.gem"
   end.join("\n")
 }
@@ -144,17 +120,45 @@ wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-
 # gem install -y --no-ri --no-rdoc  --source http://gems.github.com auser-poolparty
         EOE
       end
-
+      
       # ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
       # rm -rf /etc/puppet/ssl
       def start_puppetmaster
         <<-EOS
-/usr/bin/env puppetcleaner 2>&1 > /dev/null
 puppetmasterd --verbose  2>&1 > /dev/null
         EOS
       end
 
-      # puppetd --listen --fqdn #{@instance.name}
+      # TODO:
+      # Consider this method in the manifest
+      def create_local_node
+        str = <<-EOS
+node default {
+  include poolparty
+}
+        EOS
+         @cloud.list_of_running_instances.each do |ri|
+           str << <<-EOS           
+node "#{ri.name}" inherits default {}
+           EOS
+         end
+"echo '#{str}' > /etc/puppet/manifests/nodes/nodes.pp"
+      end
+
+      def move_templates
+        <<-EOS
+mkdir -p #{Base.template_path}
+cp #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path}
+        EOS
+      end
+      
+      def create_poolparty_manifest
+        <<-EOS
+cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
+#{copy_ssh_app}
+        EOS
+      end
+      
       def restart_puppetd
         <<-EOS
 . /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master  2>&1 > /dev/null

data/lib/poolparty/helpers/provisioners/slave.rb

@@ -26,7 +26,7 @@ module PoolParty
       def setup_configs
         <<-EOS          
           echo "#{open(File.join(template_directory, "puppet.conf")).read}" > /etc/puppet/puppet.conf
-          rm -rf /etc/puppet/ssl
+          /usr/bin/puppetrerun
         EOS
       end
 
@@ -34,8 +34,7 @@ module PoolParty
       # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
         <<-EOS
-          rm -rf /etc/puppet/ssl
-          /usr/bin/puppetrerun
+          . /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1
         EOS
       end
       

data/lib/poolparty/net/remote_instance.rb

@@ -69,6 +69,12 @@ module PoolParty
       end
       # Commands for the servers
       def self.puppet_runner_command
+        ". /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1"
+      end
+      def self.puppet_master_rerun_command
+        "/usr/bin/puppetcleaner; #{puppet_runner_command}"
+      end
+      def self.puppet_rerun_commad
         "/usr/bin/puppetrerun 2>&1 > /dev/null"
       end
     end

data/lib/poolparty/plugins/git.rb

@@ -11,12 +11,12 @@ module PoolParty
         has_package(:name => "git-core")
         has_directory(:name => "#{cwd}")
         
-        exec({:name => "git-#{name}", :requires => get_package(:name => "git-core"), :requires => get_directory("#{cwd}")}) do          
+        has_exec({:name => "git-#{name}", :requires => get_package("git-core"), :requires => get_directory("#{cwd}")}) do          
           command parent.user ? "git clone #{parent.user}@#{parent.source} #{parent.path}" : "git clone #{parent.source} #{parent.to ? parent.to : ""}"
           cwd "#{parent.cwd if parent.cwd}"
           creates "#{::File.join( (parent.cwd ? parent.cwd : cwd), ::File.basename(parent.source, ::File.extname(parent.source)) )}/.git"
         end
-        exec(:name => "update-#{name}", :requires => get_exec("git-#{name}")) do
+        has_exec(:name => "update-#{name}", :requires => get_exec("git-#{name}")) do
           cwd get_exec("git-#{parent.name}").cwd
           command "git pull"
         end

data/lib/poolparty/pool/resource.rb

@@ -105,7 +105,7 @@ module PoolParty
       # the options
       # Finally, it uses the parent's options as the lowest priority
       def initialize(opts={}, parent=self, &block)
-        # Take the options of the parents        
+        # Take the options of the parents
         set_vars_from_options(opts) unless opts.empty?
         set_resource_parent(parent)
         self.run_in_context &block if block

data/lib/poolparty/pool/resources/conditional.rb

@@ -1,9 +1,17 @@
 module PoolParty    
   module Resources
     
-    def execute_if(attr_s="$hostname", str="", parent=self, &block)
+    def execute_on_master(parent=self, &block)
+      execute_if("$hostname", "==", "master", parent, &block)
+    end
+    
+    def execute_on_node(parent=self, &block)
+      execute_if("$hostname", "!=", "master", parent, &block)
+    end
+    
+    def execute_if(attr_s="$hostname", comparison="==", str="", parent=self, &block)
       # parent = parent.is_a?(PoolParty::Cloud::Cloud) ? parent : parent.parent
-      opts = {:attribute => attr_s, :equal => str}
+      opts = {:attribute => attr_s, :equal => str, :comparison => comparison}
       options = parent.respond_to?(:options) ? parent.options.merge!(opts) : opts
       # @c = PoolParty::Resources::Conditional.new(options, parent, &block)
       parent.add_resource(:conditional, options, parent, &block)
@@ -13,7 +21,7 @@ module PoolParty
     class Conditional < Resource
       
       def initialize(opts={}, parent=self, &block)
-        name "#{opts[:name] ? opts[:name] : opts[:attribute]} == #{opts[:equal]}"
+        name "#{opts[:name] ? opts[:name] : opts[:attribute]} #{opts[:comparison]} #{opts[:equal]}"
         attribute opts[:attribute]
         equal opts[:equal]
         super
@@ -25,6 +33,10 @@ module PoolParty
         true
       end
       
+      def disallowed_options
+        [:comparison]
+      end
+      
       def printable?
         false
       end

data/lib/poolparty/pool/resources/gem_package.rb

@@ -10,18 +10,23 @@ module PoolParty
       # TODO: Add it so that it tries to pull the gem off the master fileserver first...
       def loaded(opts={}, parent=self)
         if download_url
+                    
+          execute_on_master do
+            has_exec(:name => "download-#{name}", :cwd => Base.remote_storage_path, :command => "wget #{download_url} -O #{name}.gem", :ifnot => "test -f #{Base.remote_storage_path}/#{name}.gem")
+          end
           
-          has_file(:name => "#{Base.remote_storage_path}/#{name}.gem", :source => "#{Base.fileserver_base}/#{name}.gem")
-          
-          execute_if("$hostname", "master") do
-            has_exec(:name => "download-#{name}", :cwd => Base.remote_storage_path, :command => "wget #{download_url} -O #{name}.gem", :ifnot => "test -f #{Base.remote_storage_path}/#{name}.gem", :notify => get_file("#{Base.remote_storage_path}/#{name}.gem"))
-          end          
-          
-          has_exec(opts.merge({:name => "#{name}", :cwd =>"#{Base.remote_storage_path}", :path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/var/lib/gems/1.8/bin"})) do
+          has_file({
+            :name => "#{Base.remote_storage_path}/#{name}.gem", 
+            :source => "#{Base.fileserver_base}/#{name}.gem",
+            :requires => get_host("master")
+          })
+                    
+          has_exec(opts.merge({:name => "#{name}", :cwd =>"#{Base.remote_storage_path}"})) do
             command "gem install -y --no-ri --no-rdoc #{Base.remote_storage_path}/#{name}.gem"
             ifnot "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version}"
             requires get_file("#{Base.remote_storage_path}/#{name}.gem")
           end
+          
         else
           has_exec(opts.merge({:name => "#{name}", :cwd => "/tmp", :path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/var/lib/gems/1.8/bin"})) do
             command "gem install -y --no-ri --no-rdoc #{"--version #{version}" if version} #{"--source #{source}" if source} #{name} <<heredoc

data/lib/poolparty/templates/puppetcleaner

@@ -5,4 +5,4 @@ ps aux | grep puppetmaster | awk '{print $2}' | xargs kill
 /etc/init.d/puppetmaster stop
 rm -rf /etc/puppet/ssl
 puppetmasterd --verbose
-/etc/init.d/puppetmaster start
+/etc/init.d/puppetmaster start

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 37
+    TINY  = 38
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.37
+  version: 0.2.38
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-31 00:00:00 -07:00
+date: 2008-11-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ executables:
 - server-list-active
 - server-list-responding
 - server-rerun
+- server-show-stats
 - server-start-master
 - server-start-node
 extensions: []
@@ -133,6 +134,7 @@ files:
 - bin/server-list-active
 - bin/server-list-responding
 - bin/server-rerun
+- bin/server-show-stats
 - bin/server-start-master
 - bin/server-start-node
 - config/hoe.rb

data/spec/poolparty/pool/resources/conditional_spec.rb

@@ -9,7 +9,7 @@ describe "Conditional" do
   describe "wrapped" do
     before(:each) do
       @cloud = cloud :conditional_cloud_spec do
-          execute_if("$hostname", "'master'", self) do
+          execute_if("$hostname", "==", "'master'", self) do
             has_file({:name => "/etc/apache2/puppetmaster2.conf"})
           end
       end
@@ -25,7 +25,7 @@ describe "Conditional" do
       @cond.resources.size.should == 1
     end
     it "should have a file resource on the conditional" do
-      @cond.get_resource(:file, "/etc/apache2/puppetmaster2.conf").name.should == "/etc/apache2/puppetmaster2.conf"
+      @cond.get_file("/etc/apache2/puppetmaster2.conf").name.should == "/etc/apache2/puppetmaster2.conf"
     end
     it "should have the parent as the cloud" do
       @cond.parent.should == @cloud

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.37</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.38</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.37
+  version: 0.2.38
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-31 00:00:00 -07:00
+date: 2008-11-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ executables:
 - server-list-active
 - server-list-responding
 - server-rerun
+- server-show-stats
 - server-start-master
 - server-start-node
 extensions: []
@@ -133,6 +134,7 @@ files:
 - bin/server-list-active
 - bin/server-list-responding
 - bin/server-rerun
+- bin/server-show-stats
 - bin/server-start-master
 - bin/server-start-node
 - config/hoe.rb