auser-poolparty 0.2.62 → 0.2.63

data/Manifest.txt

@@ -224,6 +224,7 @@ lib/poolparty/monitors/monitors/web_monitor.rb
 lib/poolparty/net/messenger.rb
 lib/poolparty/net/remote.rb
 lib/poolparty/net/remote_bases/ec2.rb
+lib/poolparty/net/remote_bases/ec2/ec2_response_object.rb
 lib/poolparty/net/remote_instance.rb
 lib/poolparty/net/remoter.rb
 lib/poolparty/net/remoter_base.rb

data/README.txt

@@ -43,6 +43,7 @@ sudo gem install auser-poolparty
 * Refactor provisioning to use erlang
 * Move the building of the resource tree on read to on resolve
 * Add queuing of tasks on the messenger
+* Add security group as listing
 
 == LICENSE:
 

data/bin/cloud-provision

@@ -24,9 +24,7 @@ o.loaded_clouds.each do |cloud|
         Provisioner.provision_slaves(self, testing)
       else
         vputs "Provisioning master"
-        provisioning_in_progress
-        verbose ? Provisioner.provision_master(self, testing) : hide_output { Provisioner.provision_master(self, testing) }
-        provisioning_complete
+        (verbose || testing) ? Provisioner.provision_master(self, testing) : hide_output { Provisioner.provision_master(self, testing) }
       end
     end
     

data/bin/cloud-start

@@ -9,7 +9,7 @@ end
 
 o.loaded_clouds.each do |cloud|
   with_cloud(cloud) do
-    vputs header("Starting cloud")
+    vputs header("Starting cloud #{name}")
     vputs "#{list_of_running_instances.size} running instances (#{minimum_instances} - #{maximum_instances})"
     if list_of_running_instances.size <= 1
       puts "Starting the master instance"    

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

@@ -2,10 +2,10 @@ module PoolParty
   module Provisioner
     class Master < ProvisionerBase
       
-      def initialize(cloud=self, os=:ubuntu)
-        raise MasterException.new(:no_ip) unless cloud.master && cloud.master.ip
-        super(cloud.master, cloud, os)
-        @master_ip = cloud.master.ip
+      def initialize(cl=self, os=:ubuntu)
+        raise MasterException.new(:no_ip) unless cl.master && cl.master.ip
+        super(cl.master, cl, os)
+        @master_ip = cl.master.ip
       end
 
       def valid?
@@ -133,12 +133,10 @@ wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=tru
       def restart_puppetmaster
         <<-EOS
 echo "(Re)starting poolparty"
-# . /etc/profile
+. /etc/profile
 # /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
+ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/puppet/ssl;puppetmasterd --verbose
 # # Start it back up
-# # puppetmasterd --verbose
 /etc/init.d/puppetmaster start
         EOS
       end

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

@@ -0,0 +1,52 @@
+class EC2ResponseObject
+  def self.get_descriptions(resp)      
+    rs = get_response_from(resp)
+
+    # puts rs.methods.sort - rs.ancestors.methods
+    out = begin
+      if rs.respond_to?(:instancesSet)
+        [EC2ResponseObject.get_hash_from_response(rs.instancesSet.item)]
+      else
+        rs.collect {|r| 
+          if r.instancesSet.item.class == Array
+            r.instancesSet.item.map {|t| EC2ResponseObject.get_hash_from_response(t)}
+          else
+            [EC2ResponseObject.get_hash_from_response(r.instancesSet.item)]
+          end            
+        }.flatten.reject {|a| a.nil? }
+      end
+    rescue Exception => e
+      # Really weird bug with amazon's ec2 gem
+      rs.collect {|r| EC2ResponseObject.get_hash_from_response(r)}.reject {|a| a.nil? } rescue []
+    end
+
+    out
+  end
+  def self.get_response_from(resp)
+    begin
+      rs = resp.reservationSet.item unless resp.reservationSet.nil?
+      rs ||= resp.DescribeInstancesResponse.reservationSet.item
+      rs ||= rs.respond_to?(:instancesSet) ? rs.instancesSet : rs
+      rs.reject! {|a| a.nil? || a.empty? }
+    rescue Exception => e
+      resp
+    end
+    rs
+  end
+  def self.get_hash_from_response(resp)      
+    begin
+      {
+        :instance_id => resp.instanceId,
+        :name => resp.instanceId, 
+        :ip => resp.dnsName || "not-assigned",
+        :status => resp.instanceState.name,
+        :launching_time => resp.launchTime.parse_datetime,
+        :internal_ip => resp.privateDnsName,
+        :keypair => resp.keyName
+        # :security_group => resp.groupSet.item[0].groupId
+      }        
+    rescue Exception => e
+      nil
+    end      
+  end
+end

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

@@ -1,6 +1,9 @@
+require "date"
+require "#{::File.dirname(__FILE__)}/ec2/ec2_response_object"
+
 begin
   require 'EC2'
-  require "date"
+  
   class String
     def convert_from_ec2_to_ip
       self.gsub(/.compute-1.amazonaws.com*/, '').gsub(/ec2-/, '').gsub(/-/, '.')
@@ -21,7 +24,8 @@ begin
           :maxCount => num,
           :key_name => (keypair || Base.keypair),
           :availability_zone => nil,
-          :size => "#{size || Base.size}")
+          :size => "#{size || Base.size}",
+          :group_id => ["#{security_group || 'default'}"])
         begin
           h = EC2ResponseObject.get_hash_from_response(instance)
           h = instance.instancesSet.item.first
@@ -85,6 +89,13 @@ begin
           Kernel.system "ec2-add-keypair #{keypair} > #{new_keypair_path} && chmod 600 #{new_keypair_path}"
         end
       end
+      
+      # wrapper for remote base to perform a snapshot backup for the ebs volume
+      def create_snapshot
+        return nil if ebs_volume_id.nil?
+        ec2.create_snapshot(:volume_id => ebs_volume_id)
+      end
+      
       # EC2 connections
       def ec2
         @ec2 ||= EC2::Base.new( :access_key_id => (access_key || Base.access_key), 
@@ -117,59 +128,6 @@ begin
     end
     register_remote_base :Ec2
   end
-
-  # Provides a simple class to wrap around the amazon responses
-  class EC2ResponseObject
-    def self.get_descriptions(resp)      
-      rs = get_response_from(resp)
-
-      # puts rs.methods.sort - rs.ancestors.methods
-      out = begin
-        if rs.respond_to?(:instancesSet)
-          [EC2ResponseObject.get_hash_from_response(rs.instancesSet.item)]
-        else
-          rs.collect {|r| 
-            if r.instancesSet.item.class == Array
-              r.instancesSet.item.map {|t| EC2ResponseObject.get_hash_from_response(t)}
-            else
-              [EC2ResponseObject.get_hash_from_response(r.instancesSet.item)]
-            end            
-          }.flatten.reject {|a| a.nil? }
-        end
-      rescue Exception => e
-        # Really weird bug with amazon's ec2 gem
-        rs.collect {|r| EC2ResponseObject.get_hash_from_response(r)}.reject {|a| a.nil? } rescue []
-      end
-
-      out
-    end
-    def self.get_response_from(resp)
-      begin
-        rs = resp.reservationSet.item unless resp.reservationSet.nil?
-        rs ||= resp.DescribeInstancesResponse.reservationSet.item
-        rs ||= rs.respond_to?(:instancesSet) ? rs.instancesSet : rs
-        rs.reject! {|a| a.nil? || a.empty? }
-      rescue Exception => e
-        resp
-      end
-      rs
-    end
-    def self.get_hash_from_response(resp)      
-      begin
-        {
-          :instance_id => resp.instanceId,
-          :name => resp.instanceId, 
-          :ip => resp.dnsName || "not-assigned",
-          :status => resp.instanceState.name,
-          :launching_time => resp.launchTime.parse_datetime,
-          :internal_ip => resp.privateDnsName,
-          :keypair => resp.keyName
-        }        
-      rescue Exception => e
-        nil
-      end      
-    end
-  end
 rescue LoadError
   puts <<-EOM
 Error: In order to use ec2, you need to install the amazon-ec2 gem

data/lib/poolparty/pool/base.rb

@@ -28,7 +28,8 @@ module PoolParty
       # EC2 Options
       :ami => "ami-1cd73375",
       # Options that should not be touched pretty much ever
-      :manifest_path => "/etc/puppet/manifests"
+      :manifest_path => "/etc/puppet/manifests",
+      :security_group => ["default"] 
     })
         
     # Class methods

data/lib/poolparty/pool/cloud.rb

@@ -172,7 +172,7 @@ module PoolParty
       # to be saved on the remote "master" machine
       def minimum_runnable_options
         [
-          :keypair, :minimum_instances, :maximum_instances, :ami, 
+          :keypair, :minimum_instances, :maximum_instances, :ami, :security_group,
           :expand_when, :contract_when, :set_master_ip_to
         ]
       end

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 62
+    TINY  = 63
 
     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.62
+  version: 0.2.63
 platform: ruby
 authors: 
 - Ari Lerner
@@ -334,6 +334,7 @@ files:
 - lib/poolparty/net/messenger.rb
 - lib/poolparty/net/remote.rb
 - lib/poolparty/net/remote_bases/ec2.rb
+- lib/poolparty/net/remote_bases/ec2/ec2_response_object.rb
 - lib/poolparty/net/remote_instance.rb
 - lib/poolparty/net/remoter.rb
 - lib/poolparty/net/remoter_base.rb

data/spec/poolparty/net/remote_bases/ec2_spec.rb

@@ -6,6 +6,7 @@ class TestClass
   include PoolParty::Remote::RemoterBase
   include Ec2
   include CloudResourcer
+  include CloudDsl
   
   def keypair
     "fake_keypair"
@@ -27,7 +28,7 @@ describe "ec2 remote base" do
     stub_remoter_for(@tr)
     @tr.stub!(:get_instances_description).and_return response_list_of_instances
   end
-  %w(launch_new_instance! terminate_instance! describe_instance describe_instances).each do |method|
+  %w(launch_new_instance! terminate_instance! describe_instance describe_instances create_snapshot).each do |method|
     eval <<-EOE
       it "should have the method #{method}" do
         @tr.respond_to?(:#{method}).should == true
@@ -56,6 +57,15 @@ describe "ec2 remote base" do
       @tr.ec2.should_receive(:run_instances).and_return true
       @tr.launch_new_instance!
     end
+    it "should use a specific security group if one is specified" do
+      @tr.stub!(:security_group).and_return "web"
+      @tr.ec2.should_receive(:run_instances).with(hash_including(:group_id => ['web'])).and_return true
+      @tr.launch_new_instance!      
+    end
+    it "should use the default security group if none is specified" do
+      @tr.ec2.should_receive(:run_instances).with(hash_including(:group_id => ['default'])).and_return true
+      @tr.launch_new_instance!      
+    end
     it "should get the hash response from EC2ResponseObject" do
       EC2ResponseObject.should_receive(:get_hash_from_response).and_return true
       @tr.launch_new_instance!
@@ -106,4 +116,18 @@ describe "ec2 remote base" do
       @tr.create_keypair
     end
   end
+  describe "create_snapshot" do
+    # We can assume that create_snapshot on the ec2 gem works
+    before(:each) do
+      @tr.ec2.stub!(:create_snapshot).and_return nil
+    end
+    it "should create a snapshot of the current EBS volume" do
+      @tr.ec2.stub!(:create_snapshot).and_return {{"snapshotId" => "snap-123"}}
+      @tr.stub!(:ebs_volume_id).and_return "vol-123"
+      @tr.create_snapshot.should == {"snapshotId" => "snap-123"}
+    end
+    it "should not create a snapshot if there is no EBS volume" do
+      @tr.create_snapshot.should == nil
+    end
+  end
 end

data/spec/poolparty/pool/script_spec.rb

@@ -49,6 +49,7 @@ describe "Script" do
             ami "ami-123456"
             
             cloud :app do
+              security_group "app"
               expand_when "cpu > 90", "memory > 80"
               contract_when "cpu < 10", "memory < 10"
               
@@ -63,6 +64,9 @@ describe "Script" do
         it "should save the ami" do
           @saved.should =~ /ami 'ami-123456'/
         end
+        it "should save the security group" do
+          @saved.should =~ /security_group 'app'/
+        end
         it "should save the expansions" do
           @saved.should =~ /expand_when 'cpu>90', 'memory>80'/
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.62
+  version: 0.2.63
 platform: ruby
 authors: 
 - Ari Lerner
@@ -334,6 +334,7 @@ files:
 - lib/poolparty/net/messenger.rb
 - lib/poolparty/net/remote.rb
 - lib/poolparty/net/remote_bases/ec2.rb
+- lib/poolparty/net/remote_bases/ec2/ec2_response_object.rb
 - lib/poolparty/net/remote_instance.rb
 - lib/poolparty/net/remoter.rb
 - lib/poolparty/net/remoter_base.rb