poolparty 1.4.0 → 1.4.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 4
-:patch: 0
+:patch: 1

data/bin/cloud-contract

@@ -21,6 +21,7 @@ EOS
       
       msg = [
         "Contracting cloud #{cld.name} (#{cld.keypair}) by 1",
+        "#{cld.nodes.size} running instances (#{cld.minimum_instances} - #{cld.maximum_instances})",
         " node: #{node_to_terminate.public_ip}"
       ]
       

data/bin/cloud-expand

@@ -23,8 +23,7 @@ EOS
       
       print_msg(msg)
       
-      inst = cld.expand
-      inst.bootstrap!
+      inst = cld.expand_by(1)
       
       msg = [
         "Your cloud has expanded by node: #{inst.public_ip}"

data/bin/cloud-reboot

@@ -11,13 +11,11 @@ Usage: #{$0} #{all_options_string}
   Cycle through nodes in the cloud and wait for the autoscaler to reboot 
 EOS
   
-  opt :configure, "Configure the cloud before rebooting", :type => :bool, :default => false
   short_desc "Cycle the instances"
 
   run do |command|
     
     @loaded_clouds.each do |cld|
-      cld.run if command[:configure]
       cld.reboot!
     end
     

data/bin/cloud-rsync

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + "/../lib")
+require "poolparty"
+
+require 'git-style-binary/command'
+
+GitStyleBinary.command do
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
+
+  ssh into an instance of the cloud
+EOS
+
+  short_desc "ssh into an instance of the cloud"
+  opt :to, "To this directory", :default => "~"
+    
+  run do |command|
+    cloud = @loaded_clouds.first
+    dir = command.argv.pop
+    
+    if !cloud.nodes.empty?
+      cloud.rsync(dir, command[:to])
+    else
+      puts "No running instances can be found"
+    end
+    
+  end
+end

data/bin/cloud-show

@@ -30,7 +30,8 @@ EOS
         "Running on:          #{cld.cloud_provider.name}",
         "Keypair:             #{cld.keypair.basename}",
         "Security group:      #{cld.cloud_provider.security_group_names}",
-        "Availability zones:  #{cld.cloud_provider.availability_zones}"
+        "Availability zones:  #{cld.cloud_provider.availability_zones}",
+        "User:  #{cld.user}"
       ]
       
       if cld.load_balancers.size > 0

data/examples/chef_cloud.rb

@@ -1,20 +1,15 @@
-$:.unshift("#{File.dirname(__FILE__)}/../lib")
-require "rubygems"
-require "poolparty"
 
 pool "poolparty" do
   
   cloud "chef" do
     instances 1
     using :ec2
-    chef_repo "basic/chef-repo"
+    chef_repo File.dirname(__FILE__)+"/chef_cloud/chef_repo"
     recipe "apache2"
+    recipe "rsyslog::server"
+    recipe "collectd"
     chef_attributes :apache2 => {:listen_ports => ["80", "8080"]}
-    elastic_ip "192.129.218.49", "192.129.204.191"
-    user_data <<-EOE
-#!/bin/bash -x
-echo "New User Data! ho."
-    EOE
+    user_data open(File.dirname(__FILE__)+"/chef_cloud/user_data").read
     security_group do
       authorize :from_port => "22", :to_port => "22"
       authorize :from_port => "80", :to_port => "80"

data/examples/simple.rb

@@ -18,7 +18,7 @@ pool "poolparty" do
     #   {:port=>3000..3006, :protocol=>'tcp'  :group=>'monitor' },
     #   {:port=>53, :protocol=>'udp' }
     # ]
-    security_group do
+    security_group "dummy-test-security-group" do
       %w(22 80 443 8642).each {|port|  authorize :from_port => port, :to_port => port}
     end
     load_balancer do

data/lib/cloud_providers/cloud_provider.rb

@@ -5,6 +5,11 @@ module CloudProviders
   class CloudProvider
     include Dslify
     
+    default_options(
+      :image_id    => 'ami-ed46a784',
+      :user        => "root"
+    )
+    
     attr_reader :name, :init_opts
     
     def initialize(name, init_opts={}, &block)
@@ -55,20 +60,5 @@ module CloudProviders
       init_opts.has_key?(:cloud) ? init_opts[:cloud] : nil
     end
     
-    def progress_bar_until(msg=nil, &block)
-      print "#{msg}" if msg
-      loop do
-        if block.call
-          break
-        else
-          $stdout.print "."
-          $stdout.flush
-          sleep 1
-        end
-      end
-      print " OK" if msg
-      puts "" if msg
-    end
-    
   end
 end

data/lib/cloud_providers/connections.rb

@@ -2,15 +2,7 @@ require "open3"
 
 module CloudProviders
   module Connections
-    
-    def user(n=nil)
-      if n.nil? 
-        @user ||= 'root'
-      else
-        @user = n
-      end
-    end
-    
+        
     # hostname or ip to use when running remote commands
     def host(n=nil)
       if n.nil? 

data/lib/cloud_providers/ec2/ec2.rb

@@ -54,7 +54,6 @@ module CloudProviders
     end
     
     default_options(
-      :image_id               => 'ami-ed46a784',
       :instance_type          => 'm1.small',
       :addressing_type        => "public",
       :availability_zones     => ["us-east-1a"],
@@ -73,7 +72,6 @@ module CloudProviders
       :kernel_id              => nil,
       :ramdisk_id             => nil,
       :block_device_mappings  => nil,
-      :elastic_ips            => [],  # An array of the elastic ips
       :ebs_volumes            => []   # The volume id of an ebs volume # TODO: ensure this is consistent with :block_device_mappings
     )
     
@@ -83,8 +81,8 @@ module CloudProviders
         self.send(type).each {|ele| ele.create! }
       end
     end
-    
-    def run
+        
+    def run      
       puts "  for cloud: #{cloud.name}"
       puts "  minimum_instances: #{minimum_instances}"
       puts "  maximum_instances: #{maximum_instances}"
@@ -120,27 +118,6 @@ module CloudProviders
         end
         reset!
         # ELASTIC IPS
-        unless _elastic_ips.empty?
-          unused_elastic_ip_addresses = ElasticIp.unused_elastic_ips(self).map {|i| i.public_ip }
-          used_elastic_ip_addresses = ElasticIp.elastic_ips(self).map {|i| i.public_ip }
-
-          elastic_ip_objects = ElasticIp.unused_elastic_ips(self).select {|ip_obj| _elastic_ips.include?(ip_obj.public_ip) }
-
-          assignee_nodes = nodes.select {|n| !ElasticIp.elastic_ips(self).include?(n.public_ip) }
-
-          elastic_ip_objects.each_with_index do |eip, idx|
-            # Only get the nodes that do not have elastic ips associated with them
-            begin
-              if assignee_nodes[idx]
-                puts "Assigning elastic ip: #{eip.public_ip} to node: #{assignee_nodes[idx].instance_id}"
-                ec2.associate_address(:instance_id => assignee_nodes[idx].instance_id, :public_ip => eip.public_ip)
-              end
-            rescue Exception => e
-              p [:error, e.inspect]
-            end
-            reset!
-          end
-        end
       else
         autoscalers.each do |a|
           puts "    autoscaler: #{a.name}"
@@ -156,9 +133,7 @@ module CloudProviders
         end
       end
       
-      reset!
-      from_ports = security_groups.map {|a| a.authorizes.map {|t| t.from_port.to_i }.flatten }.flatten
-      
+      from_ports = security_groups.map {|a| a.authorizes.map {|t| t.from_port.to_i }.flatten }.flatten      
       if from_ports.include?(22)
         progress_bar_until("Waiting for the instances to be accessible by ssh") do
           running_nodes = nodes.select {|n| n.running? }
@@ -169,6 +144,7 @@ module CloudProviders
         end
       end
       
+      assign_elastic_ips
     end
     
     def teardown
@@ -191,8 +167,16 @@ module CloudProviders
         :base64_encoded => true,
         :cloud => cloud
       })
+      progress_bar_until("Waiting for node to launch...") do
+        wait_for_node(e)
+      end
+      all_nodes.select {|n| n.instance_id == e.instance_id }.first
+    end
+    
+    def wait_for_node(instance)
       reset!
-      e
+      inst = all_nodes.select {|n| n.instance_id == instance.instance_id }.first
+      inst.running?
     end
     
     def contract_by(num=1)
@@ -224,6 +208,30 @@ module CloudProviders
       end
     end
     
+    def assign_elastic_ips
+      unless elastic_ips.empty?
+        unused_elastic_ip_addresses = ElasticIp.unused_elastic_ips(self).map {|i| i.public_ip }
+        used_elastic_ip_addresses = ElasticIp.elastic_ips(self).map {|i| i.public_ip }
+
+        elastic_ip_objects = ElasticIp.unused_elastic_ips(self).select {|ip_obj| elastic_ips.include?(ip_obj.public_ip) }
+
+        assignee_nodes = nodes.select {|n| !ElasticIp.elastic_ips(self).include?(n.public_ip) }
+
+        elastic_ip_objects.each_with_index do |eip, idx|
+          # Only get the nodes that do not have elastic ips associated with them
+          begin
+            if assignee_nodes[idx]
+              puts "Assigning elastic ip: #{eip.public_ip} to node: #{assignee_nodes[idx].instance_id}"
+              ec2.associate_address(:instance_id => assignee_nodes[idx].instance_id, :public_ip => eip.public_ip)
+            end
+          rescue Exception => e
+            p [:error, e.inspect]
+          end
+          reset!
+        end
+      end
+    end
+    
     def nodes
       all_nodes.select {|i| i.in_service? }#describe_instances.select {|i| i.in_service? && security_groups.include?(i.security_groups) }
     end
@@ -251,17 +259,17 @@ module CloudProviders
     
     # Extras!
     
-    def load_balancer(name=cloud.proper_name, o={}, &block)
-      load_balancers << ElasticLoadBalancer.new(name, sub_opts.merge(o || {}), &block)
+    def load_balancer(given_name=cloud.proper_name, o={}, &block)
+      load_balancers << ElasticLoadBalancer.new(given_name, sub_opts.merge(o || {}), &block)
     end
-    def autoscale(name=cloud.proper_name, o={}, &block)
-      autoscalers << ElasticAutoScaler.new(name, sub_opts.merge(o || {}), &block)
+    def autoscale(given_name=cloud.proper_name, o={}, &block)
+      autoscalers << ElasticAutoScaler.new(given_name, sub_opts.merge(o || {}), &block)
     end
-    def security_group(name=cloud.proper_name, o={}, &block)
-      security_groups << SecurityGroup.new(name, sub_opts.merge(o || {}), &block)
+    def security_group(given_name=cloud.proper_name, o={}, &block)
+      security_groups << SecurityGroup.new(given_name, sub_opts.merge(o || {}), &block)
     end
     def elastic_ip(*ips)
-      ips.each {|ip| _elastic_ips << ip}
+      ips.each {|ip| elastic_ips << ip}
     end
         
     # Proxy to the raw Grempe amazon-aws @ec2 instance
@@ -290,6 +298,9 @@ module CloudProviders
     def autoscalers
       @autoscalers ||= []
     end
+    def elastic_ips
+      @elastic_ips ||= []
+    end
     
     # Clear the cache
     def reset!
@@ -301,9 +312,6 @@ module CloudProviders
     def sub_opts
       dsl_options.merge(:parent => self, :cloud => cloud)
     end
-    def _elastic_ips
-      @_elastic_ips ||= []
-    end
     def generate_keypair(n=nil)
       puts "[EC2] generate_keypair is called with #{default_keypair_path/n}"
       begin

data/lib/cloud_providers/ec2/ec2_instance.rb

@@ -41,7 +41,7 @@ module CloudProviders
     end
     
     def run!
-      cloud_provider.ec2.run_instances(:image_id => image_id,
+      r = cloud_provider.ec2.run_instances(:image_id => image_id,
       :min_count => min_count,
       :max_count => max_count,
       :key_name => keypair.basename,
@@ -50,6 +50,10 @@ module CloudProviders
       :instance_type => instance_type,
       :availability_zone => availability_zone,
       :base64_encoded => true)
+      r.instancesSet.item.map do |i|
+        inst_options = i.merge(r.merge(:cloud => cloud)).merge(cloud.cloud_provider.dsl_options)
+        Ec2Instance.new(inst_options)
+      end.first
     end
     def self.run!(hsh); new(hsh).run!; end
     

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

@@ -9,7 +9,7 @@ module CloudProviders
                 :owner_id   => nil})
 
     def run
-      puts "Authorizing: #{cloud.proper_name} for #{protocol} to #{from_port}:#{to_port} #{network}"
+      puts "Authorizing: #{name} for #{protocol} to #{from_port}:#{to_port} #{network}"
       options = 
       if group_name
         {:authorize_security_group_ingress => group_name, :source_security_group_owner_id => owner_id}
@@ -21,7 +21,7 @@ module CloudProviders
     
     def to_hash
       {
-        :group_name   => cloud.proper_name,
+        :group_name   => name,
         :ip_protocol  => protocol,
         :from_port    => from_port,
         :to_port      => to_port,

data/lib/core/object.rb

@@ -7,5 +7,27 @@ class Object
   def reset!
     @@pool = nil
   end
-    
+  
+  def print_msg(msg_arr)
+    msg_arr.each do |line|
+      puts line
+    end
+  end
+  
+  def progress_bar_until(msg=nil, &block)
+    print "#{msg}" if msg
+    loop do
+      if block.call
+        break
+      else
+        $stdout.print "."
+        $stdout.flush
+        sleep 1
+      end
+    end
+    print " OK" if msg
+    puts "" if msg
+  end
+  
+  
 end

data/lib/poolparty/cloud.rb

@@ -91,7 +91,9 @@ You did not specify a cloud provider in your clouds.rb. Make sure you have a blo
       puts "Copying the chef-repo into the base directory from #{chef_repo}"
       FileUtils.mkdir_p base_directory/"roles"   
       if File.directory?(chef_repo)
-        FileUtils.cp_r chef_repo, base_directory 
+        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}]"]}
@@ -101,7 +103,7 @@ You did not specify a cloud provider in your clouds.rb. Make sure you have a blo
     
     def write_solo_dot_rb(to=tmp_path/"etc"/"chef"/"solo.rb")
       content = <<-EOE
-cookbook_path     ["/etc/chef/chef-repo/site-cookbooks", "/etc/chef/chef-repo/cookbooks"]
+cookbook_path     ["/etc/chef/site-cookbooks", "/etc/chef/cookbooks"]
 role_path         "/etc/chef/roles"
 log_level         :info
       EOE
@@ -138,9 +140,11 @@ log_level         :info
         (class << self; self; end).class_eval do
           @cloud_provider.public_methods(false).each do |meth|
             next if respond_to?(meth) || method_defined?(meth) || private_method_defined?(meth)
-            define_method meth.to_sym do |*args, &block|
-              @cloud_provider.send(meth, *args, &block)
-            end 
+            eval <<-EOE
+              def #{meth}(*args, &block)
+                @cloud_provider.send(:#{meth}, *args, &block)
+              end
+            EOE
         end
       end
     end
@@ -201,17 +205,19 @@ log_level         :info
     
     def reboot!
       orig_nodes = nodes
-      num_nodes = nodes.size
       if autoscalers.empty?
         puts <<-EOE
 No autoscalers defined
   Launching new nodes and then shutting down original nodes
         EOE
-        # Start new nodes
-        expand_by(num_nodes)
         # Terminate the nodes
-        orig_nodes.each do |node|
+        orig_nodes.each_with_index do |node, i|
+          # Start new nodes
+          print "Starting node: #{i}...\n"
+          expand_by(1)
+          print "Terminating node: #{i}...\n"
           node.terminate!
+          puts ""
         end
       else
         # Terminate the nodes
@@ -229,6 +235,7 @@ No autoscalers defined
           end
         end
       end
+      run
       puts ""
     end