poolparty 1.4.5 → 1.4.6

data/VERSION.yml

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

data/bin/cloud-list

@@ -35,7 +35,7 @@ EOS
           msg << "#{k.capitalize} nodes"
           msg << line
           v.each do |a|
-            msg << "  #{a.instance_id}\t#{a.status}\t#{a.public_ip}\t#{a.dns_name}"
+            msg << "  #{a.instance_id}\t#{a.status}\t#{a.public_ip}\t#{a.private_ip}\t#{a.dns_name}"
           end
           msg << ""
         end

data/lib/cloud_providers/ec2/ec2.rb

@@ -162,7 +162,7 @@ module CloudProviders
         :max_count => num,
         :key_name => keypair.basename,
         :security_groups => security_groups,
-        :user_data => user_data,
+        :user_data => decoded_user_data,
         :instance_type => instance_type,
         :availability_zone => availability_zones.first,
         :base64_encoded => true,
@@ -174,6 +174,16 @@ module CloudProviders
       all_nodes.detect {|n| n.instance_id == e.instance_id }
     end
     
+    def decoded_user_data
+      if user_data
+        if File.file?(user_data)
+          open(user_data).read
+        else
+          user_data
+        end
+      end
+    end
+    
     def wait_for_node(instance)
       reset!
       inst = all_nodes.detect {|n| n.instance_id == instance.instance_id }

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

@@ -7,26 +7,31 @@ module CloudProviders
                 :network    => "0.0.0.0/0",
                 :group_name => nil,
                 :owner_id   => nil})
-
+    
     def run
-      puts "Authorizing: #{name} for #{protocol} to #{from_port}:#{to_port} #{network}"
       options = 
       if group_name
+        puts "Authorizing #{name} for group named: #{group_name} of owner id: #{owner_id}"
         {:authorize_security_group_ingress => group_name, :source_security_group_owner_id => owner_id}
       else
+        puts "Authorizing: #{name} for #{protocol} to #{from_port}:#{to_port} #{network}"
         to_hash
       end
       ec2.authorize_security_group_ingress(options) rescue nil
     end
     
     def to_hash
-      {
-        :group_name   => name,
-        :ip_protocol  => protocol,
-        :from_port    => from_port,
-        :to_port      => to_port,
-        :cidr_ip      => network
-      }
+      if group_name
+        {:group_name => group_name}
+      else
+        {
+          :group_name   => name,
+          :ip_protocol  => protocol,
+          :from_port    => from_port,
+          :to_port      => to_port,
+          :cidr_ip      => network
+        }
+      end
     end
     
   end

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

@@ -26,5 +26,9 @@ module CloudProviders
       cloud.as
     end
     
+    def pool
+      cloud.parent
+    end
+    
   end
 end

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

@@ -7,24 +7,30 @@ module CloudProviders
       end
       current_security_groups = security_groups.map {|a| 
         a[:ip_permissions].map do |perm|
-          if perm[:ip_ranges].size > 1
-            perm[:ip_ranges].map do |range|
+          if perm[:group_name]
+            {
+              :group_name => perm[:group_name]
+            }
+          else
+            if perm[:ip_ranges].size > 1
+              perm[:ip_ranges].map do |range|
+                {
+                  :group_name => a[:name],
+                  :from_port => perm[:from_port],
+                  :to_port => perm[:to_port],
+                  :cidr_ip => range,
+                  :ip_protocol => perm[:protocol]
+                }.flatten
+              end.flatten
+            else
               {
                 :group_name => a[:name],
-                :from_port => perm[:from_port],
+                :from_port => perm[:from_port], 
                 :to_port => perm[:to_port],
-                :cidr_ip => range,
+                :cidr_ip => perm[:ip_ranges].map {|c| c[:cidrIp] }.first, # first for simplicity for now...
                 :ip_protocol => perm[:protocol]
-              }.flatten
-            end.flatten
-          else
-            {
-              :group_name => a[:name],
-              :from_port => perm[:from_port], 
-              :to_port => perm[:to_port],
-              :cidr_ip => perm[:ip_ranges].map {|c| c[:cidrIp] }.first, # first for simplicity for now...
-              :ip_protocol => perm[:protocol]
-            }
+              }
+            end
           end
         end.flatten
       }.flatten

data/lib/poolparty/cloud.rb

@@ -125,6 +125,12 @@ log_level         :info
       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
+    def pool
+      parent || pool
+    end
+    
     def tmp_path
       "/tmp/poolparty" / pool.name / name
     end
@@ -148,16 +154,7 @@ log_level         :info
         end
       end
     end
-    
-    # proxy to cloud_provider
-    # def method_missing(m,*a,&block)
-    #   if cloud_provider.respond_to?(m)
-    #     cloud_provider.send(m,*a,&block)
-    #   else
-    #     super
-    #   end
-    # end
-    
+        
     # compile the cloud spec and execute the compiled system and remote calls
     def run
       puts "  running on #{cloud_provider.class}"
@@ -174,7 +171,7 @@ log_level         :info
     # security_groups, triggers and instances defined by this cloud
     def teardown
       raise "Only Ec2 teardown supported" unless cloud_provider.name.to_s == 'ec2'
-      puts "!! Tearing down cloud #{name}"
+      puts "! Tearing down cloud #{name}"
       # load_balancers.each do |name, lb|
       #   puts "! Deleting load_balaner #{lb_name}"
       #   lb.teardown
@@ -221,6 +218,7 @@ No autoscalers defined
         end
       else
         # Terminate the nodes
+        @num_nodes = orig_nodes.size
         orig_nodes.each do |node|
           node.terminate!
           puts "----> Terminated node: #{node.instance_id}"
@@ -228,7 +226,7 @@ No autoscalers defined
           puts "----> Waiting for new node to boot via the autoscaler"
           loop do
             reset!
-            break if nodes.size == num_nodes
+            break if nodes.size == @num_nodes
             $stdout.print "."
             $stdout.flush
             sleep 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -08:00
+date: 2009-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: []