auser-poolparty 0.2.58 → 0.2.59

data/Manifest.txt

@@ -273,6 +273,7 @@ lib/poolparty/templates/poolparty.monitor
 lib/poolparty/templates/puppet.conf
 lib/poolparty/templates/puppetcleaner
 lib/poolparty/templates/puppetrerun
+lib/poolparty/templates/puppetrunner
 lib/poolparty/templates/yaws.conf
 lib/poolparty/version.rb
 lib/poolpartycl.rb

data/lib/poolparty/base_packages/poolparty.rb

@@ -6,9 +6,10 @@ module PoolParty
         # 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")
@@ -50,7 +51,7 @@ module PoolParty
         # 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
         
@@ -97,6 +98,10 @@ module PoolParty
           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

data/lib/poolparty/core/string.rb

@@ -30,6 +30,9 @@ class String
   def dir_safe
     self.downcase.gsub(/[ ]/, '_')
   end
+  def safe_quote
+    self.gsub(/[']/, '\\\\\'')
+  end
   def nice_runnable(quite=true)
     self.split(/ && /).join("\n")
   end

data/lib/poolparty/helpers/provisioner_base.rb

@@ -275,7 +275,10 @@ module PoolParty
       end
       
       def fix_rubygems
-        "echo '#{open(::File.join(template_directory, "gem")).read}' > /usr/bin/gem"
+        <<-EOE
+          #{installer_for("ruby rubygems")}
+          echo '#{open(::File.join(template_directory, "gem")).read}' > /usr/bin/gem
+        EOE
       end
 
       def create_local_node
@@ -306,7 +309,6 @@ aptitude update -y #{unix_hide_string} <<heredoc
 Y
 
 heredoc
-aptitude autoclean #{unix_hide_string} 
 fi
           "
         else

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

@@ -25,9 +25,9 @@ module PoolParty
           setup_autosigning,
           install_poolparty,
           setup_poolparty,
-          start_puppetmaster,
-          restart_puppetd,
-          clean_master_certs
+          create_local_node,        
+          run_first_time,
+          restart_puppetmaster
         ] << configure_tasks
       end
 
@@ -43,12 +43,14 @@ module PoolParty
       # If the master is not in the hosts file, then add it to the hosts file
       def create_local_hosts_entry
         <<-EOS
-if [ -z \"$(grep -v '#' /etc/hosts | grep 'puppet')" ]; then echo '#{@master_ip}           puppet master' >> /etc/hosts; fi
+echo "Creating local host entry"
+if [ -z \"$(grep -v '#' /etc/hosts | grep 'puppet')" ]; then echo '#{@master_ip}           puppet master localhost' >> /etc/hosts; fi
         EOS
       end
 
       def setup_basic_structure
         <<-EOS
+echo "Creating basic structure for poolparty"        
 mkdir -p /etc/puppet/manifests/nodes 
 mkdir -p /etc/puppet/manifests/classes
 echo "import 'nodes/*.pp'" > /etc/puppet/manifests/site.pp
@@ -59,12 +61,14 @@ cp #{Base.remote_storage_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
 
       def setup_configs
         <<-EOS
+echo "Setting up configuration"        
 echo "#{open(File.join(template_directory, "puppet.conf")).read}" > /etc/puppet/puppet.conf
         EOS
       end
 
       def setup_fileserver
         <<-EOS
+echo "Setting up the master fileserver"
 echo "
 [files]
   path #{Base.remote_storage_path}
@@ -77,12 +81,14 @@ mkdir -p /etc/poolparty
       # Change this eventually for better security supportsetup_fileserver
       def setup_autosigning
         <<-EOS
+echo "Creating accessibility for the nodes"        
 echo "*" > /etc/puppet/autosign.conf
         EOS
       end
       
       def setup_poolparty
         <<-EOS
+echo "Setting the poolparty configuration"        
 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}
         EOS
@@ -94,7 +100,7 @@ cp #{Base.remote_storage_path}/#{Base.default_specfile_name} #{Base.base_config_
       
       def install_poolparty
         <<-EOE
-#{installer_for("ruby rubygems")}
+echo "Installing poolparty"
 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
@@ -123,17 +129,26 @@ wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-
       
       # ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
       # /etc/init.d/puppetmaster stop; rm -rf /etc/puppet/ssl; /etc/init.d/puppetmaster start
-      def start_puppetmaster
+      def restart_puppetmaster
         <<-EOS
+echo "(Re)starting poolparty"
 . /etc/profile
-# /etc/init.d/puppetmaster stop #{unix_hide_string}
+/etc/init.d/puppetmaster stop #{unix_hide_string}
 ps aux | grep puppetmaster | awk '{print $2}' | xargs kill #{unix_hide_string} # just in case
 rm -rf /etc/puppet/ssl
 # Start it back up
-puppetmasterd --verbose
-# /etc/init.d/puppetmaster start #{unix_hide_string}
+# puppetmasterd --verbose
+/etc/init.d/puppetmaster start
         EOS
       end
+      
+      def run_first_time
+<<-EOE
+echo "#{open(File.join(template_directory, "puppetrerun")).read}" > /usr/bin/puppetrerun
+chmod +x /usr/bin/puppetrerun
+/bin/sh /usr/bin/puppetrerun
+EOE
+      end
 
       # TODO:
       # Consider this method in the manifest
@@ -153,6 +168,7 @@ node "#{ri.name}" inherits default {}
 
       def move_templates
         <<-EOS
+echo "Moving templates into place"
 mkdir -p #{Base.template_path}
 cp -R #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path}
         EOS
@@ -160,22 +176,25 @@ cp -R #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_p
       
       def create_poolparty_manifest
         <<-EOS
+echo "Creating the manifest"
 cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
 #{copy_ssh_app}
         EOS
       end
       
       def clean_master_certs
-        returning String.new do |s|
-          s << "puppetca --clean master.compute-1.internal 2>&1 > /dev/null;"
+        str = returning Array.new do |s|
+          s << "puppetca --clean master.compute-1.internal 2>&1 > /dev/null"
           s << "puppetca --clean master.ec2.internal 2>&1 > /dev/null"
-          s << "/usr/bin/puppetcleaner"
-        end
+        end.join(";")
+        "if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; else #{str}; fi"
       end
       
       def restart_puppetd
+        terminate_string = "ps aux | grep puppetmaster | awk '{print $2}' | xargs kill #{unix_hide_string}; puppetmasterd --verbose"
         <<-EOS
-. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master #{unix_hide_string}
+echo "Running puppet manifest"
+/bin/sh /usr/bin/puppetrerun
         EOS
       end
     end

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

@@ -15,6 +15,12 @@ module PoolParty
           start_puppet
         ]
       end
+      
+      def setup_poolparty
+        <<-EOE
+echo "#{open(File.join(template_directory, "puppetrun")).read}" > /usr/bin/puppetrun
+        EOE
+      end
 
       def setup_puppet
         <<-EOE
@@ -34,7 +40,7 @@ module PoolParty
       def run_once_and_clean
         <<-EOS
 rm -rf /etc/puppet/ssl        
-. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master #{unix_hide_string} &
+/bin/sh /usr/bin/puppetrerun
 rm -rf /etc/puppet/ssl
         EOS
       end
@@ -43,7 +49,7 @@ rm -rf /etc/puppet/ssl
       # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
         <<-EOS
-. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master #{unix_hide_string} &
+/bin/sh /usr/bin/puppetrerun
         EOS
       end
       

data/lib/poolparty/modules/cloud_dsl.rb

@@ -1,6 +1,6 @@
 module PoolParty
   module CloudDsl
-    
+        
     def mount_ebs_volume_at(id="", loc="/data")
       ebs_volume_id id
       ebs_volume_mount_point loc

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -3,6 +3,11 @@ require "ftools"
 module PoolParty
   module CloudResourcer
     
+    def plugin_directory(*args)
+      args = ["/plugins"] if args.empty?
+      args.each {|arg| Dir["#{arg}/*/*.rb"].each {|f| require f rescue "" }}
+    end
+    
     # Store block
     def store_block(&block)
       @store_block ||= block

data/lib/poolparty/modules/file_writer.rb

@@ -61,9 +61,10 @@ module PoolParty
     def make_template_directory(dir=nil)
       path = dir ? ::File.join(Base.tmp_path, Base.template_directory, ::File.basename(dir)) : ::File.join(Base.tmp_path, Base.template_directory)
       begin
-        FileUtils.mkdir_p path unless ::File.directory?(path)
+        make_base_directory
+        FileUtils.mkdir path unless ::File.directory?(path)
       rescue Errno::EEXIST
-        FileUtils.rm path
+        FileUtils.rm path if ::File.exists?(path)
         make_template_directory(dir)
       end      
       path

data/lib/poolparty/monitors/base_monitor.rb

@@ -23,7 +23,8 @@ module PoolParty
       args.each do |arg|
         (available_monitors << "#{arg}".downcase.to_sym unless available_monitors.include?("#{arg}".downcase.to_sym))
         
-        InstanceMethods.module_eval "def #{arg}; @#{arg} ||= messenger_send!(\"get_current_load #{arg}\").to_f rescue -1.0; end"
+        InstanceMethods.module_eval "def #{arg}; @#{arg} ||= get_live_#{arg}; end"
+        InstanceMethods.module_eval "def get_live_#{arg}; messenger_send!(\"get_current_load #{arg}\").to_f rescue -1.0; end"
       end
     end
 

data/lib/poolparty/net/remote_bases/ec2.rb

@@ -49,13 +49,14 @@ begin
             :name => @name,
             :hostname => h[:ip],
             :ip => h[:ip].convert_from_ec2_to_ip,
-            :launching_time => (h[:launching_time].parse_datetime)
+            :index => i,
+            :launching_time => (h[:launching_time])
           })
-        end
+        end.sort_by {|a| a[:index] }
       end
       # Get the s3 description for the response in a hash format
       def get_instances_description
-        EC2ResponseObject.get_descriptions(ec2.describe_instances).sort_by {|a| a[:launching_time] }
+        EC2ResponseObject.get_descriptions(ec2.describe_instances)
       end
 
       def after_launch_master(instance=nil)
@@ -158,7 +159,7 @@ begin
           :name => resp.instanceId, 
           :ip => resp.dnsName || "not-assigned",
           :status => resp.instanceState.name,
-          :launching_time => resp.launchTime,
+          :launching_time => resp.launchTime.parse_datetime,
           :keypair => resp.keyName
         }        
       rescue Exception => e

data/lib/poolparty/net/remote_instance.rb

@@ -69,13 +69,13 @@ 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"
+        ". /etc/profile && puppetrunner"
       end
       def self.puppet_master_rerun_command
-        "#{puppet_runner_command}"
+        ". /etc/profile && puppetrerun"
       end
       def self.puppet_rerun_commad
-        "/usr/bin/puppetrerun 2>&1 > /dev/null"
+        puppet_runner_command
       end
     end
     

data/lib/poolparty/net/remoter.rb

@@ -31,6 +31,15 @@ module PoolParty
       def rsync_command
         "rsync -azP --exclude cache -e '#{ssh_string}'"
       end
+      def remote_ssh_array
+        ["-o StrictHostKeyChecking=no", "-l '#{Base.user}'", '-i "'+remote_keypair_path+'"']
+      end
+      def remote_ssh_string
+        (["ssh"] << remote_ssh_array).join(" ")
+      end
+      def remote_rsync_command
+        "rsync -azP --exclude cache -e '#{remote_ssh_string}'"
+      end
       # Open the cached local copy of the instances list and 
       # create a new RemoteInstance from each line
       def list_from_local

data/lib/poolparty/net/remoter_base.rb

@@ -79,20 +79,30 @@ module PoolParty
         key = keyp ? keyp : keypair
         unless @describe_instances
           tmpInstanceList = describe_instances.select {|a| key ? a[:keypair] == key : true }
-          has_master = tmpInstanceList.collect {|a| a[:name] }.include?("master")
+          has_master = !tmpInstanceList.select {|a| a[:name] == "master" }.empty?
           if has_master
             @describe_instances = tmpInstanceList
-          else            
+          else
             @id = 0
-            @describe_instances = tmpInstanceList.sort_by {|a| a[:status] }.map do |inst|
+            running = select_from_instances_on_status(/running/, tmpInstanceList)
+            pending = select_from_instances_on_status(/pending/, tmpInstanceList)
+            terminated = select_from_instances_on_status(/shutting/, tmpInstanceList)
+            
+            running = running.map do |inst|
               inst[:name] = (@id == 0 ? "master" : "node#{@id}")
               @id += 1
               inst
-            end
+            end.sort_by {|a| a[:index] }
+            
+            @describe_instances = [running, pending, terminated].flatten
           end
         end
         @describe_instances
       end
+      # Select the instances based on their status
+      def select_from_instances_on_status(status=/running/, list=[])
+        list.select {|a| a[:status] =~ status}
+      end
       # Instances
       # Get the master from the cloud
       def master

data/lib/poolparty/plugins/deploydirectory.rb

@@ -4,26 +4,35 @@ module PoolParty
     virtual_resource(:deploydirectory) do
       
       def loaded(opts={}, parent=self)
-        package_directory
-        execute_on_master do
-          unpack_directory
-        end
-        has_rsync_mirror(:dir => cwd)
+        package_directory        
+        unpack_directory
+        sync_directories
       end
             
       def package_directory
         path = ::File.join( Base.tmp_path, "#{::File.basename(from_dir)}.tar.gz" )
         # cd /Users/auser/Sites/work/citrusbyte/internal/gems/pool-party/poolparty/spec/poolparty/plugins/ && tar -czf plugins.tar.gz . && mv plugins.tar.gz /tmp/poolparty && cd /tmp/poolparty
-        cmd = "cd #{::File.expand_path(from_dir)} && tar -czf #{name.dir_safe}.tar.gz . && mv #{name.dir_safe}.tar.gz #{Base.tmp_path}"
+        archive_name = "#{name.dir_safe}.tar.gz"
+        cmd = "cd #{::File.expand_path(from_dir)} && tar -czf #{archive_name} . && mv #{archive_name} #{Base.tmp_path}"
         `#{cmd}` unless testing
       end
       
-      def unpack_directory         
-        has_exec({:name => "deploy-directory-#{name}", :requires => get_directory("#{cwd}"), :cwd => cwd}) do
-          command "cd #{parent.cwd}; tar -zxf #{Base.remote_storage_path}/#{parent.name.dir_safe}.tar.gz && rm #{Base.tmp_path}/#{parent.name.dir_safe}.tar.gz"
+      def unpack_directory
+        execute_on_master do
+          has_exec({:name => "deploy-directory-#{name}", :requires => get_directory("#{cwd}"), :cwd => cwd}) do
+            #  && rm #{Base.tmp_path}/#{parent.name.dir_safe}.tar.gz
+            command "cd #{parent.cwd}; tar -zxf #{Base.remote_storage_path}/#{parent.name.dir_safe}.tar.gz; rm #{Base.remote_storage_path}/#{parent.name.dir_safe}.tar.gz"
+            onlyif "test -f #{Base.remote_storage_path}/#{parent.name.dir_safe}.tar.gz"
+          end
         end
       end
       
+      def sync_directories
+        # execute_on_master do
+          has_rsyncmirror(:dir => cwd, :name => "deploydirectory-#{name}")
+        # end
+      end
+      
       def from(dir)
         from_dir (dir.include?(" ") ? dir.gsub(/[ ]/, '') : dir)
       end

data/lib/poolparty/plugins/line.rb

@@ -26,11 +26,12 @@ module PoolParty
         EOE
       end
       
-      def delete_lines_from(file="", pattern=//)
+      def delete_lines_from(file="", pattern=//, opts={})
         call_function <<-EOE
         delete_lines {
           '#{file}' :
             file => '#{file}',
+            #{opts.flush_out("\t", ",")}
             pattern => '#{pattern}'
         }
         EOE

data/lib/poolparty/plugins/rsyncmirror.rb

@@ -1,14 +1,11 @@
 module PoolParty    
-  class Git
+  class Rsyncmirror
         
     virtual_resource(:rsyncmirror) do
       
       def loaded(opts={}, parent=self)
-        has_rsync_mirror(opts, parent)
-      end
-            
-      def has_rsync_mirror(opts={}, parent=self)
-        has_exec(:command => "rsync -aRqv --no-implied-dirs --delete --delete-excluded '#{Base.user}@master:#{opts[:dir]}' '#{opts[:dir]}'", :name => "rsync-#{name}")
+        @parent = parent
+        has_exec(opts.merge({:command => "#{cloud.remote_rsync_command} --no-implied-dirs --delete-excluded #{Base.user}@master:#{dir}/ #{dir}/".safe_quote, :name => "rsync-#{name}"}))
       end
             
       # Since git is not a native type, we have to say which core resource

data/lib/poolparty/pool/cloud.rb

@@ -45,11 +45,18 @@ module PoolParty
       
       def initialize(name, parent, &block)
         @name = name
-        # store_block(&block)
+        
+        plugin_directory "#{::Dir.pwd}/plugins"
+        
         set_parent(parent) if parent
         self.instance_eval &block if block
+        
+        setup_defaults
+      end
+      
+      def setup_defaults
         # this can be overridden in the spec, but ec2 is the default
-        self.using :ec2
+        self.using :ec2        
       end
                               
       # Keypairs

data/lib/poolparty/pool/pool.rb

@@ -34,13 +34,14 @@ module PoolParty
       })
       
       def initialize(name,&block)
+        setup_defaults
+        
         @name = name
         instance_eval &block if block
       end
       
-      def plugin_directory(*args)
-        args = ["/plugins"] if args.empty?
-        args.each {|arg| Dir["#{arg}/*/*.rb"].each {|f| require f rescue "" }}
+      def setup_defaults
+        plugin_directory "#{::Dir.pwd}/plugins" 
       end
             
       # This is where the entire process starts

data/lib/poolparty/pool/resource.rb

@@ -18,7 +18,7 @@ module PoolParty
     end
     
     def add_resource(type, opts={}, parent=self, &block)      
-      if in_resources?(type, opts[:name])
+      if in_resources?(type, opts[:name])        
         get_resource(type, opts[:name], parent)
       else
         returning "PoolParty::Resources::#{type.to_s.camelize}".classify.constantize.new(opts, parent, &block) do |o|                    
@@ -150,6 +150,14 @@ module PoolParty
         self.class.custom_functions << str
       end
       
+      def cloud
+        @p = parent
+        while !@p.is_a?(PoolParty::Cloud)
+          @p = @p.parent
+        end
+        @p
+      end
+      
       def self.custom_functions_to_string(pre="")
         returning Array.new do |output|
           PoolParty::Resources.available_custom_resources.each do |resource|

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

@@ -2,16 +2,16 @@ module PoolParty
   module Resources
     
     def execute_on_master(parent=self, &block)
-      execute_if("$hostname", "==", "master", parent, &block)
+      execute_if("$hostname", "==", "master", {}, parent, &block)
     end
     
     def execute_on_node(parent=self, &block)
-      execute_if("$hostname", "!=", "master", parent, &block)
+      execute_if("$hostname", "!=", "master", {:notequal => true}, parent, &block)
     end
     
-    def execute_if(attr_s="$hostname", comparison="==", str="", parent=self, &block)
+    def execute_if(attr_s="$hostname", comparison="==", str="", cust_opts={}, parent=self, &block)
       # parent = parent.is_a?(PoolParty::Cloud::Cloud) ? parent : parent.parent
-      opts = {:attribute => attr_s, :equal => str, :comparison => comparison}
+      opts = {:attribute => attr_s, :equal => str, :comparison => comparison}.merge(cust_opts)
       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)
@@ -24,6 +24,7 @@ module PoolParty
         name "#{opts[:name] ? opts[:name] : opts[:attribute]} #{opts[:comparison]} #{opts[:equal]}"
         attribute opts[:attribute]
         equal opts[:equal]
+        notequal opts.has_key?(:notequal) ? opts[:notequal] : false
         super
       end
       
@@ -34,7 +35,7 @@ module PoolParty
       end
       
       def disallowed_options
-        [:comparison]
+        [:comparison, :notequal]
       end
       
       def printable?
@@ -49,8 +50,13 @@ module PoolParty
         returning Array.new do |output|
           output << "# #{name.sanitize}"
           output << "case #{attribute} {"
-          output << "#{equal} : { #{resources_string_from_resources(resources)} }"
-          output << "default : {}"
+          if notequal
+            output << "#{equal} : {}"
+            output << "default : { #{resources_string_from_resources(resources)} }"
+          else
+            output << "#{equal} : { #{resources_string_from_resources(resources)} }"
+            output << "default : {}"
+          end                    
           output << "}"
         end.join("\n")
       end

data/lib/poolparty/templates/haproxy.conf

@@ -28,7 +28,7 @@ defaults
   stats uri /poolparty
   stats realm Statistics\ for\ PoolParty
 
-listen <%= name_haproxy %> 
+listen poolparty
     bind 0.0.0.0:<%= ports_haproxy.join(",0.0.0.0:") %>
     cookie POOLPARTYPARTY
     <%- node_ips_haproxy.chomp.split(/\t/).each_with_index do |ip, index| -%>    

data/lib/poolparty/templates/puppetrerun

@@ -2,4 +2,19 @@
 
 . /etc/profile
 # rm -rf /etc/puppet/ssl
-/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master  2>&1 > /dev/null
+if [ `/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master` ];
+  then
+  echo '';
+  else
+  ps aux | grep puppetmaster | awk '{print $2}' | xargs kill
+  /etc/init.d/puppetmaster stop
+  rm -rf /etc/puppet/ssl
+  /etc/init.d/puppetmaster start
+  if [ `/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master` ];
+    then
+    echo '';
+    else
+    # Try again
+    /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+  fi
+fi

data/lib/poolparty/templates/puppetrunner

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+. /etc/profile
+# rm -rf /etc/puppet/ssl
+if [ `hostname` -eq "master"];
+  then
+  /bin/sh puppetrerun
+  else
+  if [ `/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master` ];
+    then
+    echo '';
+    else
+    /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+  fi
+fi

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 58
+    TINY  = 59
 
     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.58
+  version: 0.2.59
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-13 00:00:00 -08:00
+date: 2008-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -381,6 +381,7 @@ files:
 - lib/poolparty/templates/puppet.conf
 - lib/poolparty/templates/puppetcleaner
 - lib/poolparty/templates/puppetrerun
+- lib/poolparty/templates/puppetrunner
 - lib/poolparty/templates/yaws.conf
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb

data/spec/poolparty/helpers/provisioners/master_spec.rb

@@ -27,7 +27,7 @@ describe "Master provisioner" do
       @master.should_receive(:setup_fileserver)
     end
     it "should call create_local_node" do
-      @master.should_receive(:create_local_node)      
+      @master.should_receive(:create_local_node).twice
     end
     it "should call the custom_install_tasks" do
       @master.should_receive(:custom_install_tasks)

data/spec/poolparty/net/remote_instance_spec.rb

@@ -70,7 +70,7 @@ describe "Remote Instance" do
       @ri.respond_to?(:puppet_runner_command).should == true
     end
     it "should return the puppet_runner_command with puppetd" do
-      @ri.puppet_runner_command.should =~ /puppetd/
+      @ri.puppet_runner_command.should =~ /puppetrun/
     end
   end
 end

data/spec/poolparty/net/remoter_base_spec.rb

@@ -54,7 +54,7 @@ describe "RemoterBase" do
           @tr.list_of_instances("fake_keypair").map {|a| a[:name] }.should == ["master", "node1", "node2", "node3"]
         end
         it "should be able to grab all the blist keypairs" do
-          @tr.list_of_instances("blist").map {|a| a[:name] }.should == ["master"]
+          @tr.list_of_instances("blist").map {|a| a[:name] }.should == ["node4"]
         end
       end
       describe "get by name" do

data/spec/poolparty/plugins/deploydirectory_spec.rb

@@ -11,7 +11,11 @@ describe "Remote Instance" do
   end
   describe "wrapped" do
     before(:each) do
-      @tc = TestClass.new
+      @tc = TestClass.new      
+      @cloud = MyOpenStruct.new(:keypair => "keys", :remote_keypair_path => "/keypair_path", :name => "cloudcloud")
+      @cloud.stub!(:is_a?).with(PoolParty::Cloud::Cloud).and_return true
+      @tc.stub!(:parent).and_return @cloud
+      
       @options = {:name => "deploydirectory", :from => ::File.dirname(__FILE__), :to => "/var/www/deploydirectory", :testing => false}
     end
     it "should be a string" do
@@ -39,6 +43,9 @@ describe "Remote Instance" do
       it "should not have the to in the to_string" do
         @tc.resource(:deploydirectory).first.to_string.should_not =~ /to /
       end
+      it "should have onlyif in the to_string" do
+        @tc.resource(:deploydirectory).first.to_string.should =~ /onlyif/
+      end
     end
   end
 end

data/spec/poolparty/pool/cloud_spec.rb

@@ -284,7 +284,7 @@ describe "Cloud" do
               File.open("test_manifest.pp", "w+") {|f| f << @manifest}
             end
             it "should include the hosts for all the listed local instances" do
-              @manifest.should =~ /host \{\n\t\t"gen_master":/
+              @manifest.should =~ /master :/
             end
           end
           describe "building with an existing manifest" do

data/spec/poolparty/pool/pool_spec.rb

@@ -36,7 +36,7 @@ describe "Pool" do
           plugin_directory "yaway"
         end
       end
-      it "should call Dir when the plugin directory is set" do
+      it "should call Dir when the plugin directory is set" do        
         Dir.should_receive(:[]).with("yaway/*/*.rb").once.and_return []        
       end
     end

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
@@ -30,6 +30,18 @@ describe "Conditional" do
     it "should have the parent as the cloud" do
       @cond.parent.should == @cloud
     end
+    describe "helpers" do
+      it "should have execute_on_master with the string $hostname == 'master'" do
+        str = execute_on_master do
+          has_file(:name => "/etc/vars")
+        end.to_string.should =~ /\$hostname==master/
+      end
+      it "should have execute_on_node with the string $hostname != 'master'" do
+        str = execute_on_node do
+          has_file(:name => "/etc/vars")
+        end.to_string.should =~ /\$hostname!=master/
+      end
+    end
     describe "to_string" do
       before(:each) do
         @string = @cond.to_string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.58
+  version: 0.2.59
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-13 00:00:00 -08:00
+date: 2008-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -381,6 +381,7 @@ files:
 - lib/poolparty/templates/puppet.conf
 - lib/poolparty/templates/puppetcleaner
 - lib/poolparty/templates/puppetrerun
+- lib/poolparty/templates/puppetrunner
 - lib/poolparty/templates/yaws.conf
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb