auser-poolparty 0.2.56 → 0.2.57

data/Manifest.txt

@@ -25,6 +25,7 @@ bin/messenger-get-current-nodes
 bin/pool
 bin/pool-console
 bin/pool-describe
+bin/pool-init
 bin/pool-list
 bin/pool-spec
 bin/pool-start

data/bin/cloud-ensure-provisioning

@@ -23,7 +23,9 @@ o.loaded_clouds.each do |cloud|
         s << "/usr/sbin/puppetca --clean #{node}.compute-1.internal"
         s << "/usr/sbin/puppetca --clean #{node}.ec2.internal"
       end.join(";")
-      `. /etc/profile && #{str};cloud-provision -i #{node.gsub(/node/, '')};#{str}`
+      cmd = ". /etc/profile && #{str};cloud-provision -i #{node.gsub(/node/, '')};#{str}"
+      vputs "Executing #{cmd}"
+      `#{cmd}`
     end
     # @tp.join
   end  

data/bin/cloud-refresh

@@ -10,6 +10,7 @@ end
 o.loaded_clouds.each do |cloud|
   
   with_cloud(cloud) do
+    vputs "Calling reconfigure_cloud!('force_reconfig') on #{master.ip}"
     reconfigure_cloud!("force_reconfig")
   end
   

data/lib/erlang/messenger/include/defines.hrl

@@ -1,6 +1,6 @@
 % Includes file for the PoolParty Messenger
 
--define(debug, true).
+% -define(debug, true).
 
 -ifdef(debug).
 

data/lib/poolparty.rb

@@ -7,15 +7,35 @@ require 'rubygems'
     require lib
   rescue Exception => e
     @required_software << lib
-    puts "Could not find library #{lib}: #{e}"
   end  
 end
 
 unless @required_software.empty?
-  puts "*****************************************"
-  puts "*           Error                       *"
-  puts "* Missing required software             *"
-  puts ""
+  @num_lines = 45
+  @centered_lines = @num_lines - 4
+  def wrap_cline(line)
+    "* #{line.center(@centered_lines)} *"
+  end
+  def wrap_lline(line)
+    "* #{line.ljust(@centered_lines)} *"
+  end
+  def header
+    "*"*@num_lines
+  end
+  empty_line = "* #{" ".ljust(@centered_lines)} *"
+  # error_initializing_message.txt
+  puts header
+  puts wrap_cline("Error")
+  puts wrap_lline("Missing required software")
+  puts @required_software.map {|a| wrap_lline("  #{a}") }  
+  puts wrap_lline("Please install the required software")
+  puts wrap_lline("and try again")
+  puts empty_line
+  puts wrap_lline("Try installing #{@required_software.size == 1 ? "it" : "them"} with")
+  puts @required_software.map {|a| wrap_lline("  gem install #{a}") }  
+  puts empty_line
+  puts "*"*@num_lines
+  exit(0)
 end
 
 # Use active supports auto load mechanism

data/lib/poolparty/base_packages/haproxy.rb

@@ -11,8 +11,8 @@ module PoolParty
           
           # Template variables
           has_variable(:name => "name_haproxy", :value => "#{cloud.name}")
-          has_variable(:name => "nodenames_haproxy", :value => "generate('/usr/bin/env', '/var/lib/gems/1.8/bin/server-list-active', '-c', 'name')")
-          has_variable(:name => "node_ips_haproxy",  :value => "generate('/usr/bin/env', '/var/lib/gems/1.8/bin/server-list-active', '-c', 'ip')")
+          has_variable(:name => "nodenames_haproxy", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'name')")
+          has_variable(:name => "node_ips_haproxy",  :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'ip')")
           
           has_variable(:name => "ports_haproxy", :value => ([(self.respond_to?(:port) ? port : Base.port)].flatten))        
           has_variable(:name => "forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Base.forwarding_port))

data/lib/poolparty/base_packages/poolparty.rb

@@ -72,7 +72,7 @@ module PoolParty
             requires get_gempackage("poolparty")
             command(". /etc/profile && cloud-handle-load")
           end          
-          has_cron(:name => "provisioning ensurer", :user => Base.user, :minute => "*/3") do
+          has_cron(:name => "provisioning ensurer", :user => Base.user, :minute => "*/2") do
             requires get_gempackage("poolparty")
             command ". /etc/profile && cloud-ensure-provisioning"
           end

data/lib/poolparty/helpers/provisioner_base.rb

@@ -100,7 +100,7 @@ module PoolParty
           process_clean_reconfigure_for!(@instance, testing)
           
           vputs "Logging in and running provisioning on #{@instance.name}"
-          cmd = "cd #{Base.remote_storage_path} && chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh; rm install_#{name}.sh"
+          cmd = "cd #{Base.remote_storage_path} && /bin/chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh; /bin/rm install_#{name}.sh"
           verbose ? @cloud.run_command_on(cmd, @instance) : hide_output {@cloud.run_command_on(cmd, @instance)}
           
           process_clean_reconfigure_for!(@instance, testing)
@@ -134,7 +134,7 @@ module PoolParty
           vputs "Logging on to #{@instance.ip}"
           @cloud.rsync_storage_files_to(@instance)
 
-          cmd = "cd #{Base.remote_storage_path} && chmod +x configure_#{name}.sh && /bin/sh configure_#{name}.sh && rm configure_#{name}.sh"
+          cmd = "cd #{Base.remote_storage_path} && /bin/chmod +x configure_#{name}.sh && /bin/sh configure_#{name}.sh && /bin/rm configure_#{name}.sh"
           verbose ? @cloud.run_command_on(cmd, @instance) : hide_output {@cloud.run_command_on(cmd, @instance)}
         end
       end

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

@@ -129,6 +129,7 @@ ps aux | grep puppetmaster | awk '{print $2}' | xargs kill #{unix_hide_string} #
 rm -rf /etc/puppet/ssl
 # Start it back up
 puppetmasterd --verbose
+/usr/bin/puppetcleaner
 # /etc/init.d/puppetmaster start #{unix_hide_string}
         EOS
       end

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

@@ -34,7 +34,7 @@ module PoolParty
       def run_once_and_clean
         <<-EOS
 rm -rf /etc/puppet/ssl        
-. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master #{unix_hide_string}
+. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master #{unix_hide_string} &
 rm -rf /etc/puppet/ssl
         EOS
       end
@@ -43,7 +43,7 @@ rm -rf /etc/puppet/ssl
       # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
         <<-EOS
-. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master #{unix_hide_string}
+. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master #{unix_hide_string} &
         EOS
       end
       

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

@@ -1,9 +1,13 @@
 begin
   require 'EC2'
+  require "date"
   class String
     def convert_from_ec2_to_ip
       self.gsub(/.compute-1.amazonaws.com*/, '').gsub(/ec2-/, '').gsub(/-/, '.')
     end
+    def parse_datetime
+      DateTime.parse( self.chomp ) rescue self
+    end
   end
   module PoolParty
     module Ec2
@@ -44,13 +48,14 @@ begin
           h.merge!({
             :name => @name,
             :hostname => h[:ip],
-            :ip => h[:ip].convert_from_ec2_to_ip
+            :ip => h[:ip].convert_from_ec2_to_ip,
+            :launching_time => (h[:launching_time].parse_datetime)
           })
         end
       end
       # Get the s3 description for the response in a hash format
       def get_instances_description
-        EC2ResponseObject.get_descriptions(ec2.describe_instances).sort_by {|a| a[:launching_time]}
+        EC2ResponseObject.get_descriptions(ec2.describe_instances).sort_by {|a| a[:launching_time] }
       end
 
       def after_launch_master(instance=nil)
@@ -146,7 +151,7 @@ begin
       end
       rs
     end
-    def self.get_hash_from_response(resp)
+    def self.get_hash_from_response(resp)      
       begin
         {
           :instance_id => resp.instanceId,

data/lib/poolparty/pool/base.rb

@@ -12,7 +12,7 @@ module PoolParty
     default_options({
       :environment => "production",
       :user => "root", # This should change here
-      :base_keypair_path => "~/.ec2",
+      :base_keypair_path => "#{ENV["HOME"]}/.ec2",
       :tmp_path => "/tmp/poolparty",
       :remote_storage_path => "/var/poolparty",
       :remote_gem_path => "/var/poolparty/gems",

data/lib/poolparty/pool/cloud.rb

@@ -33,8 +33,8 @@ module PoolParty
       default_options({
         :minimum_instances => 2,
         :maximum_instances => 5,
-        :contract_when => "cpu < 0.15",
-        :expand_when => "cpu > 0.9",
+        :contract_when => "cpu < 0.65",
+        :expand_when => "cpu > 1.9",
         :access_key => Base.access_key,
         :secret_access_key => Base.secret_access_key,
         :ec2_dir => ENV["EC2_HOME"],

data/lib/poolparty/templates/poolparty.monitor

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Based on puppet High Availability recipe
 # 
 # http://reductivelabs.com/trac/puppet/wiki/Recipes/HighAvailability

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 56
+    TINY  = 57
 
     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.56
+  version: 0.2.57
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-12 00:00:00 -08:00
+date: 2008-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ executables:
 - pool
 - pool-console
 - pool-describe
+- pool-init
 - pool-list
 - pool-spec
 - pool-start
@@ -132,6 +133,7 @@ files:
 - bin/pool
 - bin/pool-console
 - bin/pool-describe
+- bin/pool-init
 - bin/pool-list
 - bin/pool-spec
 - bin/pool-start

data/spec/poolparty/modules/cloud_resourcer_spec.rb

@@ -73,7 +73,7 @@ describe "CloudResourcer" do
         @tc.respond_to?(:keypair_path).should == true
       end
       it "should set the keypair to the Base.keypair_path" do      
-        @tc.keypair_path.should =~ /#{File.expand_path(Base.base_keypair_path)}/
+        @tc.keypair_path.should =~ /\.ec2\/rangerbob/
       end
       it "should set the keypair to have the keypair set" do
         @tc.keypair.should =~ /rangerbob/

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

@@ -13,7 +13,9 @@ class TestClass
   
   def ami;"ami-abc123";end
   def size; "small";end
-  
+  def verbose
+    false
+  end
   def ec2
     @ec2 ||= EC2::Base.new( :access_key_id => "not_an_access_key", :secret_access_key => "not_a_secret_access_key")
   end
@@ -32,6 +34,20 @@ describe "ec2 remote base" do
       end
     EOE
   end
+  describe "helpers" do
+    it "should be able to convert an ec2 ip to a real ip" do
+      "ec2-72-44-36-12.compute-1.amazonaws.com".convert_from_ec2_to_ip.should == "72.44.36.12"
+    end
+    it "should not throw an error if another string is returned" do
+      "72.44.36.12".convert_from_ec2_to_ip.should == "72.44.36.12"
+    end
+    it "should be able to parse the date from the timestamp" do
+      "2008-11-13T09:33:09+0000".parse_datetime.should == DateTime.parse("2008-11-13T09:33:09+0000")
+    end
+    it "should rescue itself and just return the string if it fails" do
+      "thisisthedate".parse_datetime.should == "thisisthedate"
+    end
+  end
   describe "launching" do
     before(:each) do
       @tr.ec2.stub!(:run_instances).and_return true

data/spec/poolparty/pool/base_spec.rb

@@ -11,8 +11,8 @@ describe "Base" do
   it "should set the user to root" do
     Base.user.should == "root"
   end
-  it "should set the base keypair path to ~/.ec2" do
-    Base.base_keypair_path.should == "~/.ec2"
+  it "should set the base keypair path to $HOME/.ec2" do
+    Base.base_keypair_path.should =~ /\.ec2/
   end
   it "should set the storage_directory to the tmp directory of the current working directory" do
     Base.storage_directory.should =~ /tmp/

data/spec/poolparty/spec_helper.rb

@@ -121,7 +121,7 @@ def remove_stub_instance_from(o, num)
   # o.stub!(:remote_instances_list).once.and_return ris
 end
 def stub_instance(num=1, status="running", keypair="fake_keypair")
-  {:name => "node#{num}", :ip => "192.168.0.#{num}", :status => "#{status}", :launching_time => num.minutes.ago, :keypair => "#{keypair}"}
+  {:name => "node#{num}", :ip => "192.168.0.#{num}", :status => "#{status}", :launching_time => num.minutes.ago.to_s, :keypair => "#{keypair}"}
 end
 def drop_pending_instances_for(o)
   puts "hi"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.56
+  version: 0.2.57
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-12 00:00:00 -08:00
+date: 2008-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ executables:
 - pool
 - pool-console
 - pool-describe
+- pool-init
 - pool-list
 - pool-spec
 - pool-start
@@ -132,6 +133,7 @@ files:
 - bin/pool
 - bin/pool-console
 - bin/pool-describe
+- bin/pool-init
 - bin/pool-list
 - bin/pool-spec
 - bin/pool-start