poolparty 1.6.1 → 1.6.2

data/README.rdoc

@@ -51,6 +51,7 @@ There are a number of commands PoolParty offers to interact with your cloud. The
 * <tt>cloud list</tt>
 * <tt>cloud show</tt>
 * <tt>cloud ssh</tt>
+* <tt>cloud run</tt>
 
 Clouds are distinguished by security groups. If a security group is not specified in your cloud block, one will be created based on the naming convention poolname-cloudname.
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 6
-:patch: 1
+:patch: 2
 :major: 1
 :build: 

data/bin/cloud

@@ -40,6 +40,10 @@ EOS
     
     @loaded_pool = pool
     @loaded_clouds = command[:name] ? [pool.clouds[command[:name]]] : pool.clouds.map {|name,cld|cld}    
+    if @loaded_clouds.count == 0
+      puts "No clouds loaded. Check your clouds.rb or -n option"
+      exit
+    end
   end
   
   run do |command|

data/examples/chef_cloud.rb

@@ -4,11 +4,13 @@ pool "poolparty" do
   cloud "chef" do
     instances 1
     using :ec2
-    chef_repo File.dirname(__FILE__)+"/chef_cloud/chef_repo"
-    recipe "apache2"
-    recipe "rsyslog::server"
-    recipe "collectd"
-    chef_attributes :apache2 => {:listen_ports => ["80", "8080"]}
+    chef :solo do
+      repo File.dirname(__FILE__)+"/chef_cloud/chef_repo"
+      recipe "apache2"
+      recipe "rsyslog::server"
+      recipe "collectd"
+      attributes :apache2 => {:listen_ports => ["80", "8080"]}
+    end
     user_data open(File.dirname(__FILE__)+"/chef_cloud/user_data").read
     security_group do
       authorize :from_port => "22", :to_port => "22"

data/lib/cloud_providers/connections.rb

@@ -21,7 +21,7 @@ module CloudProviders
           sleep(2)
         end
       end
-      false
+      connected
     end
     
     def run(commands, o={})
@@ -38,6 +38,8 @@ module CloudProviders
       # Get the environment hash out of
       # the extra_ssh_ops and then delete
       # the element
+      ssh_error_msg="SSH is not available for this node. perhaps you need to authorize it?"
+      raise PoolParty::PoolPartyError.create("SSHError", ssh_error_msg) unless ssh_available?
       env = extra_ssh_ops[:env] || {}
       extra_ssh_ops.delete :env
 
@@ -47,6 +49,7 @@ module CloudProviders
         do_sudo = extra_ssh_ops[:do_sudo] 
         extra_ssh_ops.delete :do_sudo
       end
+      do_sudo=user!="root"
 
       envstring = env.collect {|k,v| "#{k}=#{v}"}.join ' && '
       envstring += " && " unless envstring.size == 0
@@ -86,9 +89,12 @@ module CloudProviders
     
     def rsync( opts={} )
       raise StandardError.new("You must pass a :source=>uri option to rsync") unless opts[:source]
+      ssh_error_msg="SSH is not available for this node. perhaps you need to authorize it?"
+      raise PoolParty::PoolPartyError.create("SSHError", ssh_error_msg) unless ssh_available?
       destination_path = opts[:destination] || opts[:source]
       rsync_opts = opts[:rsync_opts] || '-va'
-      rsync_opts += %q% --rsync-path="sudo rsync" --exclude=.svn --exclude=.git --exclude=.cvs %
+      rsync_opts += %q% --rsync-path="sudo rsync"% unless user=="root"
+      rsync_opts += %q% --exclude=.svn --exclude=.git --exclude=.cvs %
       cmd_string =  "rsync -L  -e 'ssh #{ssh_options}' #{rsync_opts} #{opts[:source]}  #{user}@#{host}:#{destination_path}"
       out = system_run(cmd_string)
       out

data/lib/cloud_providers/ec2/ec2.rb

@@ -59,7 +59,7 @@ module CloudProviders
 
     # Load credentials from file
     def self.load_keys_from_credential_file(filename=default_credential_file, caching=true)
-      return {:access_key => @access_key, :secret_access_key => @secret_access_key} if @access_key and @secret_access_key
+      return {:access_key => @access_key, :secret_access_key => @secret_access_key} if @access_key and @secret_access_key and caching
       return {} if filename.nil? or not File.exists?(filename)
       puts("Reading keys from file: #{filename}")
       File.open(filename).each_line { |line|
@@ -230,6 +230,10 @@ module CloudProviders
     end
     
     def bootstrap_nodes!(tmp_path=nil)
+      unless security_groups.map {|a| a.authorizes.map {|t| t.from_port.to_i }.flatten }.flatten.include?(22)      
+        warn "Cloud security_groups are not authorized for ssh. Cannot bootstrap."
+        return
+      end
       tmp_path ||= cloud.tmp_path
       nodes.each do |node|
         next unless node.in_service?
@@ -241,6 +245,10 @@ module CloudProviders
     end
     
     def configure_nodes!(tmp_path=nil)
+      unless security_groups.map {|a| a.authorizes.map {|t| t.from_port.to_i }.flatten }.flatten.include?(22)      
+        warn "Cloud security_groups are not authorized for ssh. Cannot configure."
+        return
+      end
       tmp_path ||= cloud.tmp_path
       nodes.each do |node|
         next unless node.in_service?
@@ -248,6 +256,9 @@ module CloudProviders
         node.rsync_dir(tmp_path) if tmp_path
         node.run_chef!
       end
+      ebs_volume_groups.each do |vol_grp|
+        vol_grp.verify_attachments nodes
+      end
     end
     
     def assign_elastic_ips
@@ -384,7 +395,7 @@ module CloudProviders
     #     size 200
     #   end
     def ebs_volumes(name=nil, &block)
-      ebs_volume_groups << ElasticBlockStoreGroup.new(sub_opts,&block) 
+      ebs_volume_groups << ElasticBlockStoreGroup.new(sub_opts,&block) if block
     end
 
     def assign_ebs_volumes
@@ -404,25 +415,29 @@ module CloudProviders
     # The function will return volumes matching *all* filters. A volume is a filter match if *any* one of the filter values equals the volume parameter value.
     def list_ec2_volumes(filters=nil)
       @volumes_on_ec2=ec2.describe_volumes.volumeSet.item unless @volumes_on_ec2
-      return @volumes_on_ec2 if filters.nil? # no filter to check, so return at once
-      @volumes_on_ec2.select{|vol| # select volumes for which no filter failed
-        not filters.map {|filter_key, filter_val|
-          filter_key=filter_key.to_s if filter_key.is_a?(Symbol) # filter_key may be given as a symbol
-          raise ArgumentError, "Filter key #{filter_key} is invalid" unless vol.has_key?(filter_key)
-          if filter_val.is_a?(Array) # Deal with multiple filter values
-            filter_val.map{|val| val.is_a?(String) ? val : val.to_s}.member?(vol[filter_key]) # make sure fiter_val array values are Strings before checking for match
-          else
-            filter_val.is_a?(String) ? filter_val : filter_val.to_s==vol[filter_key] # make sure fiter_val is a String before comparing
-          end
-          }.member?(false) # Check if a filter failed, the 'not' statement at the beginning of the map block negates this so 'select' will choose only when no filter failed
-      }.compact # remove nil results from volume set.
+      (if filters.nil? # no filter to check, so return at once
+        @volumes_on_ec2
+      else
+        @volumes_on_ec2.select{|vol| # select volumes for which no filter failed
+          not filters.map {|filter_key, filter_val|
+            filter_key=filter_key.to_s if filter_key.is_a?(Symbol) # filter_key may be given as a symbol
+            raise ArgumentError, "Filter key #{filter_key} is invalid" unless vol.has_key?(filter_key)
+            if filter_val.is_a?(Array) # Deal with multiple filter values
+              filter_val.map{|val| val.is_a?(String) ? val : val.to_s}.member?(vol[filter_key]) # make sure fiter_val array values are Strings before checking for match
+            else
+              (filter_val.is_a?(String) ? filter_val : filter_val.to_s)==vol[filter_key] # make sure fiter_val is a String before comparing
+            end
+            }.member?(false) # Check if a filter failed, the 'not' statement at the beginning of the map block negates this so 'select' will choose only when no filter failed
+          }.compact # remove nil results from volume set.
+        end
+        ).map{|vol| ElasticBlockStore.new(vol,:cloud => cloud)}
     end
 
     # Read credentials from credential_file if one exists
     def credential_file(file=nil)
       unless file.nil?
-	      dsl_options[:credential_file]=file 
-	      dsl_options.merge((Ec2.load_keys_from_credential_file(file)))
+        dsl_options[:credential_file]=file 
+        dsl_options.merge!(Ec2.load_keys_from_credential_file(file))
       else
         fetch(:credential_file)
       end

data/lib/cloud_providers/ec2/ec2_instance.rb

@@ -41,6 +41,10 @@ module CloudProviders
     def reachable?
       ping_port self.public_ip, 22
     end
+
+    def ssh_available?
+      cloud.security_groups.map {|a| a.authorizes.map {|t| t.from_port.to_i }.flatten }.flatten.include?(22) and reachable? and in_service?
+    end
     
     def in_service?
       running?

data/lib/cloud_providers/ec2/helpers/elastic_block_store.rb

@@ -2,13 +2,14 @@ module CloudProviders
   class ElasticBlockStore < Ec2Helper
 
     # instance methods
-    attr_accessor :volumeId, :size, :snapshotId, :status, :attachments, :device, :availabilityZone, :instance_id
-    attr_reader :createTime
+    attr_reader :volumeId, :size, :snapshotId, :status, :attachments, :device, :availabilityZone, :instanceId
+    attr_reader :createTime 
 
     alias :volume_id :volumeId
     alias :snapshot_id :snapshotId
     alias :availability_zone :availabilityZone 
     alias :create_time :createTime
+    alias :instance_id :instanceId
 
     def createTime(create_time)
       unless create_time.class==DateTime
@@ -24,10 +25,14 @@ module CloudProviders
 
     def parse_raw_response(raw_response)
       @raw_respons = raw_response
-      raw_response.each{|k,v| send k+"=", v if respond_to?(k+"=") }
-      if raw_response.attachmentSet.respond_to?(:item)
+      raw_response.each{|k,v| instance_variable_set("@"+k,v) if respond_to?(k) }
+      unless raw_response.attachmentSet.nil?
         @attachments=raw_response.attachmentSet.item 
-        @attachments.each{|attch| instance_id=attch.instanceId if attch.status=="attached"}
+        @attachments.each{|attch| if attch.status=="attached" or attch.status=="attaching"
+            @instanceId=attch.instanceId 
+            @device=attch.device
+          end
+        }
       end
     end
 
@@ -43,11 +48,19 @@ module CloudProviders
     end
 
     def attach(ec2_instance,device)
-      ec2.attach_volume(:volume_id => volume_id, :instance_id => ec2_instance.instance_id, :device => device).return=="true"
+      if ec2.attach_volume(:volume_id => volume_id, :instance_id => ec2_instance.instance_id, :device => device).return=="true"
+        update!
+        return true
+      end
+      false
     end
 
     def detach
-      ec2.detach_volume(:volume_id => volume_id).return=="true"
+      if ec2.detach_volume(:volume_id => volume_id).return=="true"
+        update!
+        return true
+      end
+      false
     end
 
     def detach!

data/lib/cloud_providers/ec2/helpers/elastic_block_store_group.rb

@@ -57,17 +57,23 @@ module CloudProviders
         # Check no volumes are attached to node on device
         skip_node=false
         cloud.list_ec2_volumes.each{|vol| 
-          if vol.attached?(node.instance_id)and vol.device == device
+          if vol.attached?(node.instance_id) and vol.device == device
             warn "A volume is allready attached to device #{device} of instance #{node.instance_id}" 
             skip_node = true
           end
         }
         unless skip_node
           vol=get_free_volume(node.zone)
-          vol.device=device
           vol.attach(node,device) 
         end
       }
     end
+    
+    def verify_attachments(nodes)
+      nodes_without_volume=nodes.select do |node|
+        volumes_attached_to(node.id).size=0
+      end
+      attach nodes_without_volume if nodes_without_volume.any?
+    end
   end
 end

data/lib/cloud_providers/remote_instance.rb

@@ -38,29 +38,15 @@ module CloudProviders
     
     def chef_bootstrapped?
       # do_sudo is false cause we want to capture the return code of the call
-      @chef_bootstrapped ||= !ssh(["gem list | grep chef"], :do_sudo => false).empty?
+      @chef_bootstrapped ||= cloud.chef.node_bootsrapped?(self)
     end
     
     def bootstrap_chef!
-      unless chef_bootstrapped?
-        ssh([
-          'apt-get update',
-          'apt-get autoremove -y',
-          'apt-get install -y ruby ruby-dev rubygems git-core libopenssl-ruby',
-          'gem sources -a http://gems.opscode.com',
-          'gem install chef ohai --no-rdoc --no-ri' ])
-      end
-      ssh(bootstrap_gems.collect { |gem| "gem install #{gem} --no-rdoc --no-ri" } )
+      cloud.chef.node_bootstrap(self) unless chef_bootstrapped?
     end
     
     def run_chef!
-      chef_solo_cmd = <<-CMD
-        $GEM_BIN/chef-solo -j /etc/chef/dna.json -c /etc/chef/solo.rb
-      CMD
-      envhash = {
-        :GEM_BIN => %q%$(gem env | grep "EXECUTABLE DIRECTORY" | awk "{print \\$4}")%
-      }
-      ssh([chef_solo_cmd.strip.squeeze(' ')], :env => envhash )
+      cloud.chef.node_run!(self)
     end
         
     def run
@@ -127,6 +113,9 @@ module CloudProviders
       Time.now - Time.parse(launch_time)
     end
     
+    def ssh_available?
+      warn "Implemented in cloudprovider instance class. something is wrong"
+    end
     # def  to_s
     #  (cloud ? to_hash.merge(:cloud=>cloud.name) : to_hash)
     # end

data/lib/poolparty/chef.rb

@@ -0,0 +1,80 @@
+module PoolParty
+  class Chef < Base
+    def self.types
+      return [:solo,:client]
+    end
+    
+    def self.get_chef(type,cloud,&block)
+      ("Chef" + type.to_s.capitalize).constantize(PoolParty).send(:new,type,:cloud => cloud,&block)
+    end
+    # Chef    
+    
+    def attributes(hsh={}, &block)
+      @attributes ||= ChefAttribute.new(hsh, &block)
+    end
+
+    def override_attributes(hsh={}, &block)
+      @override_attributes ||= ChefAttribute.new(hsh, &block)
+    end
+    
+    # Adds a chef recipe to the cloud
+    #
+    # The hsh parameter is inserted into the override_attributes.
+    # The insertion is performed as follows. If
+    # the recipe name = "foo::bar" then effectively the call is
+    #
+    # override_attributes.merge! { :foo => { :bar => hsh } }
+    def recipe(recipe_name, hsh={})
+      _recipes << recipe_name unless _recipes.include?(recipe_name)
+
+      head = {}
+      tail = head
+      recipe_name.split("::").each do |key|
+        unless key == "default"
+          n = {}
+          tail[key] = n
+          tail = n
+        end
+      end
+      tail.replace hsh
+
+      override_attributes.merge!(head) unless hsh.empty?
+    end
+    
+    def recipes(*recipes)
+      recipes.each do |r|
+        recipe(r)
+      end
+    end
+
+    def node_run!(remote_instance)
+      envhash = {
+        :GEM_BIN => %q%$(gem env | grep "EXECUTABLE DIRECTORY" | awk "{print \\$4}")%
+      }
+      remote_instance.ssh([chef_cmd.strip.squeeze(' ')], :env => envhash )
+    end
+
+    def node_bootsrapped?(remote_instance)
+      remote_instance.ssh(["(gem list; dpkg -l chef) | grep -q chef && echo 'chef installed'"], :do_sudo => false).empty?
+    end
+   def node_bootstrap!(remote_instance)
+      remote_instance.ssh([
+        'apt-get update',
+        'apt-get autoremove -y',
+        'apt-get install -y ruby ruby-dev rubygems git-core libopenssl-ruby',
+        'gem sources -a http://gems.opscode.com',
+        'gem install chef ohai --no-rdoc --no-ri' ])
+      remote_instance.ssh(remote_instance.bootstrap_gems.collect { |gem| "gem install #{gem} --no-rdoc --no-ri" } )
+    end
+    private
+    
+    def _recipes
+      @_recipes ||= []
+    end
+
+    def method_missing(m,*args,&block)
+      cloud.send(m,*args,&block) if cloud.respond_to?(m)
+    end
+    
+  end
+end

data/lib/poolparty/chef_attribute.rb

@@ -33,4 +33,4 @@ module PoolParty
     end
     
   end
-end
+end

data/lib/poolparty/chef_client.rb

@@ -0,0 +1,63 @@
+module PoolParty
+  # Chef class bootstrapping chef-client.
+  class ChefClient < Chef
+    dsl_methods :server_url,:validation_token
+    
+    def openid_url(url=nil)
+      if url.nil?
+        return @openid_url||= (u=URI.parse(server_url)
+        u.port=4001
+        openid_url u.to_s)
+      else
+        @openid_url=url 
+      end
+    end
+    
+    def roles(*roles)
+      return @_roles||=[cloud.name] if roles.empty?
+      @_roles=roles
+    end
+
+    def compile!
+      build_tmp_dir
+    end
+
+    private
+    def after_initialized
+      raise PoolPartyError.create("ChefArgumentMissing", "server_url must be specified!") unless server_url
+    end
+    def chef_cmd
+      return <<-CMD
+        PATH="$PATH:$GEM_BIN" chef-client -j /etc/chef/dna.json -c /etc/chef/client.rb -d -i 1800 -s 20
+      CMD
+    end
+    # The NEW actual chef resolver.
+    def build_tmp_dir
+      base_directory = tmp_path/"etc"/"chef"
+      FileUtils.rm_rf base_directory
+      FileUtils.mkdir_p base_directory   
+      puts "Creating the dna.json"
+      attributes.to_dna [], base_directory/"dna.json", {:run_list => roles.map{|r| "role[#{r}]"} + _recipes.map{|r| "recipe[#{r}]"}}.merge(attributes.init_opts)
+      write_client_dot_rb
+    end
+    
+    def write_client_dot_rb(to=tmp_path/"etc"/"chef"/"client.rb")
+      content = <<-EOE
+log_level          :info
+log_location       "/var/log/chef/client.log"
+ssl_verify_mode    :verify_none
+file_cache_path    "/var/cache/chef"
+pid_file           "/var/run/chef/client.pid"
+Chef::Log::Formatter.show_time = true
+openid_url         "#{openid_url}"
+      EOE
+      %w(search_url role_url remotefile_url template_url registration_url).each{|url|
+        content+="#{url}   \"#{server_url}\"\n"
+      }
+      content+="validation_token  \"#{validation_token}\"\n" if validation_token
+      File.open(to, "w") do |f|
+        f << content
+      end
+    end
+  end
+end

data/lib/poolparty/chef_solo.rb

@@ -0,0 +1,70 @@
+module PoolParty
+  class ChefSolo < Chef
+    dsl_methods :repo 
+    def compile!
+      build_tmp_dir
+    end
+
+    private
+    def chef_cmd
+      return <<-CMD
+        PATH="$PATH:$GEM_BIN" chef-solo -j /etc/chef/dna.json -c /etc/chef/solo.rb
+      CMD
+    end
+    # The NEW actual chef resolver.
+    def build_tmp_dir
+      base_directory = tmp_path/"etc"/"chef"
+      FileUtils.rm_rf base_directory
+      puts "Copying the chef-repo into the base directory from #{repo}"
+      FileUtils.mkdir_p base_directory/"roles"   
+      if File.directory?(repo)
+        if File.exist?(base_directory)
+          # First remove the directory
+          FileUtils.remove_entry base_directory, :force => true
+        end
+        FileUtils.cp_r "#{repo}/.", base_directory 
+      else
+        raise "#{repo} chef repo directory does not exist"
+      end
+      puts "Creating the dna.json"
+      attributes.to_dna [], base_directory/"dna.json", {:run_list => ["role[#{cloud.name}]"]}
+      write_solo_dot_rb
+      write_chef_role_json tmp_path/"etc"/"chef"/"roles/#{cloud.name}.json"
+    end
+    
+    def write_solo_dot_rb(to=tmp_path/"etc"/"chef"/"solo.rb")
+      content = <<-EOE
+cookbook_path     ["/etc/chef/site-cookbooks", "/etc/chef/cookbooks"]
+role_path         "/etc/chef/roles"
+log_level         :info
+      EOE
+
+      File.open(to, "w") do |f|
+        f << content
+      end
+    end
+    
+    def write_chef_role_json(to=tmp_path/"etc"/"chef"/"dna.json")
+
+      # Add the parent name and the name of the cloud to
+      # the role for easy access in recipes.
+      pp = {
+        :poolparty => {
+            :parent_name => cloud.parent.name,
+            :name => cloud.name,
+        }
+      }
+
+      override_attributes.merge! pp
+      ca = ChefAttribute.new({
+        :name => cloud.name,
+        :json_class => "Chef::Role",
+        :chef_type => "role",
+        :default_attributes => attributes.init_opts,
+        :override_attributes => override_attributes.init_opts,
+        :description => description
+      })
+      ca.to_dna _recipes.map {|a| File.basename(a) }, to
+    end
+  end
+end

data/lib/poolparty/cloud.rb

@@ -55,112 +55,6 @@ You did not specify a cloud provider in your clouds.rb. Make sure you have a blo
       end
     end
     
-    # Chef    
-    def chef_repo(filepath=nil)
-      return @chef_repo if @chef_repo
-      @chef_repo = filepath.nil? ? nil : File.expand_path(filepath)
-    end
-    
-    def chef_attributes(hsh={}, &block)
-      @chef_attributes ||= ChefAttribute.new(hsh, &block)
-    end
-
-    def chef_override_attributes(hsh={}, &block)
-      @chef_override_attributes ||= ChefAttribute.new(hsh, &block)
-    end
-    
-    # Adds a chef recipe to the cloud
-    #
-    # The hsh parameter is inserted into the chef_override_attributes.
-    # The insertion is performed as follows. If
-    # the recipe name = "foo::bar" then effectively the call is
-    #
-    # chef_override_attributes.merge! { :foo => { :bar => hsh } }
-    def recipe(recipe_name, hsh={})
-      _recipes << recipe_name unless _recipes.include?(recipe_name)
-
-      head = {}
-      tail = head
-      recipe_name.split("::").each do |key|
-        unless key == "default"
-          n = {}
-          tail[key] = n
-          tail = n
-        end
-      end
-      tail.replace hsh
-
-      chef_override_attributes.merge!(head) unless hsh.empty?
-
-    end
-    
-    def recipes(*recipes)
-      recipes.each do |r|
-        recipe(r)
-      end
-    end
-    
-    private
-    
-    def _recipes
-      @_recipes ||= []
-    end
-    
-    # The NEW actual chef resolver.
-    def build_tmp_dir
-      base_directory = tmp_path/"etc"/"chef"
-      FileUtils.rm_rf base_directory
-      puts "Copying the chef-repo into the base directory from #{chef_repo}"
-      FileUtils.mkdir_p base_directory/"roles"   
-      if File.directory?(chef_repo)
-        if File.exist?(base_directory)
-          # First remove the directory
-          FileUtils.remove_entry base_directory, :force => true
-        end
-        FileUtils.cp_r "#{chef_repo}/.", base_directory 
-      else
-        raise "#{chef_repo} chef repo directory does not exist"
-      end
-      puts "Creating the dna.json"
-      chef_attributes.to_dna [], base_directory/"dna.json", {:run_list => ["role[#{name}]"]}
-      write_solo_dot_rb
-      write_chef_role_json tmp_path/"etc"/"chef"/"roles/#{name}.json"
-    end
-    
-    def write_solo_dot_rb(to=tmp_path/"etc"/"chef"/"solo.rb")
-      content = <<-EOE
-cookbook_path     ["/etc/chef/site-cookbooks", "/etc/chef/cookbooks"]
-role_path         "/etc/chef/roles"
-log_level         :info
-      EOE
-
-      File.open(to, "w") do |f|
-        f << content
-      end
-    end
-    
-    def write_chef_role_json(to=tmp_path/"etc"/"chef"/"dna.json")
-
-      # Add the parent name and the name of the cloud to
-      # the role for easy access in recipes.
-      pp = {
-        :poolparty => {
-            :parent_name => parent.name,
-            :name => name,
-        }
-      }
-
-      chef_override_attributes.merge! pp
-      ca = ChefAttribute.new({
-        :name => name,
-        :json_class => "Chef::Role",
-        :chef_type => "role",
-        :default_attributes => chef_attributes.init_opts,
-        :override_attributes => chef_override_attributes.init_opts,
-        :description => description
-      })
-      ca.to_dna _recipes.map {|a| File.basename(a) }, to
-    end
     
     # The pool can either be the parent (the context where the object is declared)
     # or the global pool object
@@ -191,12 +85,16 @@ log_level         :info
         end
       end
     end
-        
+
+    def chef(chef_type=:solo, &block)
+      raise ArgumentError, "Chef type must be one of #{Chef.types.map{|v| ":" + v.to_s}.join(",")}." unless Chef.types.include?(chef_type)
+      @chef||=Chef.get_chef(chef_type,self,&block)
+    end
     # compile the cloud spec and execute the compiled system and remote calls
     def run
       puts "  running on #{cloud_provider.class}"
       cloud_provider.run
-      unless chef_repo.nil?
+      unless @chef.nil?
         compile!
         bootstrap!
       end
@@ -280,7 +178,7 @@ No autoscalers defined
     end
     
     def compile!
-      build_tmp_dir unless chef_repo.nil?
+      @chef.compile! unless @chef.nil?
     end
     
     def bootstrap!

data/lib/poolparty.rb

@@ -45,6 +45,9 @@ require "keypair"
 $LOAD_PATH.unshift(File.dirname(__FILE__)/"poolparty")
 %w( base 
     chef_attribute
+    chef
+    chef_solo
+    chef_client
     cloud pool
   ).each do |lib|
   require "poolparty/#{lib}"
@@ -52,4 +55,4 @@ end
 
 require 'cloud_providers'
 
-puts "PoolParty core loadtime: #{Time.now-t}"
+puts "PoolParty core loadtime: #{Time.now-t}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -08:00
+date: 2010-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -269,7 +269,10 @@ files:
 - lib/keypair.rb
 - lib/poolparty.rb
 - lib/poolparty/base.rb
+- lib/poolparty/chef.rb
 - lib/poolparty/chef_attribute.rb
+- lib/poolparty/chef_client.rb
+- lib/poolparty/chef_solo.rb
 - lib/poolparty/cloud.rb
 - lib/poolparty/pool.rb
 - lib/poolparty/pool_party_error.rb