poolparty 1.4.8 → 1.5.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 8
+:patch: 0
 :major: 1
 :build: 
-:minor: 4
+:minor: 5

data/bin/cloud-show

@@ -38,10 +38,17 @@ EOS
         load_balancers = cld.cloud_provider.load_balancers.first.running_load_balancers.map {|a| a[:dns_name]}
         msg << "Load balancers:      #{load_balancers.join("\n\t\t\t")}"
       end
+
+      if cld.rds_instances.size > 0
+        available = cld.cloud_provider.available_rds_instances.map{|r| "#{r.instance_id}\t#{r.current_status.Endpoint.Address}" }
+        available.unshift 'RDS Instances:'
+
+        msg << available.join("\n\t\t\t")
+      end
             
       puts msg.flatten
       
     end
     
   end
-end
+end

data/lib/cloud_providers/connections.rb

@@ -27,15 +27,48 @@ module CloudProviders
     def run(commands, o={})
       ssh(commands)
     end
-  	
+  
+    def shell_escape(str)
+      String(str).gsub(/(?=["'\\$])/n, '\\').
+        gsub(/\n/, "'\n'").
+        sub(/^$/, "''")
+    end
+
     def ssh( commands=[], extra_ssh_ops={})
-      commands = commands.compact.join(' && ') if commands.is_a?(Array)
-      cmd_string = "ssh #{user}@#{host} #{ssh_options(extra_ssh_ops)}"
+      # Get the environment hash out of
+      # the extra_ssh_ops and then delete
+      # the element
+      env = extra_ssh_ops[:env] || {}
+      extra_ssh_ops.delete :env
+
+      # Decide to use sudo or not
+      do_sudo = true
+      if extra_ssh_ops.has_key? :do_sudo
+        do_sudo = extra_ssh_ops[:do_sudo] 
+        extra_ssh_ops.delete :do_sudo
+      end
+
+      envstring = env.collect {|k,v| "#{k}=#{v}"}.join ' && '
+      envstring += " && " unless envstring.size == 0
+      ssh_string = "ssh #{user}@#{host} #{ssh_options(extra_ssh_ops)}"
+
       if commands.empty?
         #TODO: replace this with a IO.popen call with read_nonblocking to show progress, and accept input
-        Kernel.system(cmd_string)
+        Kernel.system(ssh_string)
       else
-        system_run(cmd_string+" '#{commands}'")
+        r = nil
+        commands.each do |command|
+
+          cmd = "#{envstring}#{command}" 
+          if do_sudo
+            sudocmd = %Q% sudo sh -c "#{shell_escape cmd}" % 
+          else
+            sudocmd = cmd
+          end
+
+          r = system_run ssh_string + %Q% "#{shell_escape sudocmd}"% 
+        end
+        r
       end
     end
     
@@ -46,7 +79,7 @@ module CloudProviders
     def ssh_options(opts={})
       return @ssh_options if @ssh_options && opts.empty?
       ssh_opts = {"-i" => keypair.full_filepath,
-           "-o" =>"StrictHostKeyChecking=no"
+           "-o" =>"StrictHostKeyChecking=no",
            }.merge(opts)
       @ssh_options = ssh_opts.collect{ |k,v| "#{k} #{v}"}.join(' ')
     end
@@ -55,7 +88,8 @@ module CloudProviders
       raise StandardError.new("You must pass a :source=>uri option to rsync") unless opts[:source]
       destination_path = opts[:destination] || opts[:source]
       rsync_opts = opts[:rsync_opts] || '-va'
-      cmd_string =  "rsync -L -e 'ssh #{ssh_options}' #{rsync_opts} #{opts[:source]}  #{user}@#{host}:#{destination_path}"
+      rsync_opts += %q% --rsync-path="sudo rsync" --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
     end
@@ -106,4 +140,4 @@ module CloudProviders
     end
     
   end
-end
+end

data/lib/cloud_providers/ec2/ec2.rb

@@ -326,6 +326,10 @@ module CloudProviders
       rds_instances << RdsInstance.new(given_name, sub_opts.merge(o || {}), &block)
     end
 
+    def available_rds_instances
+      rds_instances.select{|r| r.available? }
+    end
+
     # Proxy to the raw Grempe amazon-aws @ec2 instance
     def ec2
       @ec2 ||= begin

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

@@ -145,7 +145,7 @@ module CloudProviders
           :user_data => user_data,
           :kernel_id => kernel_id,
           :ramdisk_id => ramdisk_id,
-          :block_device_mappings => block_device_mappings
+          :block_device_mapping => block_device_mapping
         })
       rescue Exception => e
         puts <<-EOE
@@ -424,4 +424,4 @@ module CloudProviders
       "#{(measure_names[measure] || measure)}-#{name}" || name
     end
   end
-end
+end

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

@@ -32,7 +32,7 @@ module CloudProviders
 
     # get volumes that are not attached
     def free_volumes(availability_zone)
-      @volumes.select{|vol| vol.available? and vol.availability_zone == availability_zone}
+      @volumes.flatten.select{|vol| vol.available? and vol.availability_zone == availability_zone}
     end
     # Get a free volume from existing volumes in group or create a new one
     def get_free_volume(availability_zone)

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

@@ -33,6 +33,22 @@ module CloudProviders
       delete_rds_instance!
     end
 
+    def current_status
+      rds_instances.detect{|i| i.DBInstanceIdentifier == instance_id }
+    end
+
+    def exists?
+      ! current_status.nil?
+    end
+
+    def available?
+      exists? && current_status.DBInstanceStatus == 'available'
+    end
+
+    def instance_id
+      name.to_s
+    end
+
   private
 
     def authorizations
@@ -53,11 +69,7 @@ module CloudProviders
     end
 
     def should_create_rds_instance?
-      rds_instances.select{|i| i.DBInstanceIdentifier == instance_id }.empty?
-    end
-
-    def instance_id
-      name.to_s
+      ! exists?
     end
 
     def create_rds_instance!
@@ -107,4 +119,4 @@ module CloudProviders
       end
     end
   end
-end
+end

data/lib/cloud_providers/remote_instance.rb

@@ -37,7 +37,8 @@ module CloudProviders
     end
     
     def chef_bootstrapped?
-      @chef_bootstrapped ||= !ssh(["gem list | grep chef"]).empty?
+      # 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?
     end
     
     def bootstrap_chef!
@@ -45,19 +46,21 @@ module CloudProviders
         ssh([
           'apt-get update',
           'apt-get autoremove -y',
-          'apt-get install -y ruby ruby-dev rubygems git-core',
+          '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' ] + 
-          bootstrap_gems.collect { |gem| "gem install #{gem} --no-rdoc --no-ri" } )
+          'gem install chef ohai --no-rdoc --no-ri' ])
       end
+      ssh(bootstrap_gems.collect { |gem| "gem install #{gem} --no-rdoc --no-ri" } )
     end
     
     def run_chef!
       chef_solo_cmd = <<-CMD
-        GEM_BIN=$(gem env | grep "EXECUTABLE DIRECTORY" | awk "{print \\$4}") \
-        && $GEM_BIN/chef-solo -j /etc/chef/dna.json -c /etc/chef/solo.rb
+        $GEM_BIN/chef-solo -j /etc/chef/dna.json -c /etc/chef/solo.rb
       CMD
-      ssh([chef_solo_cmd.strip.squeeze(' ')])
+      envhash = {
+        :GEM_BIN => %q%$(gem env | grep "EXECUTABLE DIRECTORY" | awk "{print \\$4}")%
+      }
+      ssh([chef_solo_cmd.strip.squeeze(' ')], :env => envhash )
     end
         
     def run

data/lib/poolparty/cloud.rb

@@ -64,10 +64,34 @@ You did not specify a cloud provider in your clouds.rb. Make sure you have a blo
     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)
-      _attributes.merge!(recipe_name => hsh) unless hsh.empty?
+
+      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)
@@ -81,16 +105,18 @@ You did not specify a cloud provider in your clouds.rb. Make sure you have a blo
     def _recipes
       @_recipes ||= []
     end
-    def _attributes
-      @_attributes ||= {}
-    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"
@@ -114,12 +140,23 @@ log_level         :info
     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 => {},
+        :override_attributes => chef_override_attributes.init_opts,
         :description => description
       })
       ca.to_dna _recipes.map {|a| File.basename(a) }, to

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.4.8
+  version: 1.5.0
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -08:00
+date: 2010-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: []