auser-poolparty 0.2.88 → 0.2.89

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 02:30 12/16/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 16:58 12/16/08)
 
 To get started, run the generator:
 

data/lib/poolparty/base_packages/haproxy.rb

@@ -7,9 +7,9 @@ module PoolParty
           has_package({:name => "haproxy"})
           
           # Service is required
-          has_service(:name => "haproxy", :ensures => "running")
+          has_service(:name => "haproxy", :ensures => "running", :hasrestart => true)
           # Restart sysklogd after we update the haproxy.log
-          has_service(:name => "sysklogd", :notify => get_service("haproxy"))
+          has_service(:name => "sysklogd")
           
           # Template variables          
           has_variable(:name => "name_haproxy", :value => "#{cloud.name}")

data/lib/poolparty/helpers/optioner.rb

@@ -90,7 +90,7 @@ module PoolParty
         blk.call(@opts, self) if blk
       end
       
-      @opts.on('-V', '--version', 'Display the version')    { puts @version ; exit 0 }
+      @opts.on('-V', '--version', 'Display the version')    { output_version ; exit 0 }
       @opts.on_tail("-h", "--help", "Show this message") do
         puts @opts
         puts @extra_help
@@ -127,7 +127,7 @@ module PoolParty
     end
         
     def output_version
-      puts @version
+      puts ::PoolParty::Version
     end
     
   end

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -38,10 +38,15 @@ module PoolParty
     end
     
     def setup_dev
+      return true if ::File.exists?("#{remote_keypair_path}") || master.nil?
       unless ::File.exists?("#{full_keypair_basename_path}.pub")
         cmd = "scp #{scp_array.join(" ")} #{Base.user}@#{master.ip}:.ssh/authorized_keys #{full_keypair_basename_path}.pub"
         vputs "Running #{cmd}"
-        Kernel.system(cmd)
+        if %x[hostname].chomp == "master"
+          Kernel.system("cat ~/.ssh/authorized_keys > #{full_keypair_basename_path}.pub")
+        else
+          Kernel.system(cmd)
+        end        
       end
     end
     
@@ -100,8 +105,8 @@ module PoolParty
     def keypair_paths
       [
         Base.base_keypair_path,
-        Base.base_config_directory,
-        Base.remote_storage_path
+        Base.remote_storage_path,
+        Base.base_config_directory
       ]
     end
     

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

@@ -91,10 +91,10 @@ end
         begin
           # when_no_pending_instances do
             if instance
-              ec2.attach_volume(:volume_id => ebs_volume_id, :instance_id => instance.instance_id, :device => ebs_volume_device) if ebs_volume_id && ebs_volume_mount_point
+              attach_volume(instance)
               # Let's associate the address LAST so that we can still connect to the instance
-              # for the other tasks here              
-              ec2.associate_address(:instance_id => instance.instance_id, :public_ip => set_master_ip_to) if set_master_ip_to              
+              # for the other tasks here
+              associate_address(instance)
               reset_remoter_base!
             end
           # end
@@ -104,6 +104,17 @@ end
         reset_remoter_base!
         when_all_assigned_ips {wait "5.seconds"}
       end
+      
+      def attach_volume(instance=nil)
+        vputs "Attaching volume #{ebs_volume_id} to the master at #{ebs_volume_device}"
+        instance = master        
+        ec2.attach_volume(:volume_id => ebs_volume_id, :instance_id => instance.instance_id, :device => ebs_volume_device) if ebs_volume_id && ebs_volume_mount_point
+      end
+      def associate_address(instance=nil)
+        vputs "Associating master with #{set_master_ip_to}"
+        instance = master
+        ec2.associate_address(:instance_id => instance.instance_id, :public_ip => set_master_ip_to) if set_master_ip_to
+      end
 
       # Help create a keypair for the cloud
       # This is a helper to create the keypair and add them to the cloud for you
@@ -134,6 +145,17 @@ end
           # copy_file_to_storage_directory(pub_key)
           # copy_file_to_storage_directory(private_key)
         end
+        if set_master_ip_to && master.ip.to_s != set_master_ip_to.to_s
+          associate_address(master)
+          reset_remoter_base!
+        
+          when_no_pending_instances do
+            when_all_assigned_ips do
+              vputs "Associated master with #{set_master_ip_to}"
+            end
+          end
+        end
+        
       end
       def has_cert_and_key?
         pub_key && private_key

data/lib/poolparty/net/remoter.rb

@@ -47,12 +47,11 @@ module PoolParty
       def remote_rsync_command
         "rsync -azP --exclude cache -e '#{remote_ssh_string}'"
       end
-      
-      
-      # def scp_command(source, dest=target, remote_instance=master)
-      #   #TODO: check if source is Directory and add -r if it is
-      #   "scp #{source} #{remote_instance.ip}:#{dest} #{ssh_array.join(' ')}"
-      # end
+            
+      def scp_to_command(source, dest=target, remote_instance=master)
+        #TODO: check if source is Directory and add -r if it is
+        "scp #{source} #{remote_instance.ip}:#{dest} #{scp_array.join(' ')}"
+      end
       
       # Get the names of the nodes. Mainly used for puppet templating
       def list_of_node_names(options={})

data/lib/poolparty/provisioners/capistrano/capistrano.rb

@@ -9,14 +9,14 @@ module PoolParty
       def process_install!(testing=false)
         unless testing
           @cloud.rsync_storage_files_to(@instance)
-          roles = provision_master? ? [:master] : [:slaves]
+          roles = provision_master? ? [:master] : [:single]
           run_capistrano(roles,:install)
         end
       end
       def process_configure!(testing=false)
         unless testing
           @cloud.rsync_storage_files_to(@instance)
-          roles = provision_master? ? [:master] : [:slaves]
+          roles = provision_master? ? [:master] : [:single]
           run_capistrano(roles, :configure)
         end
       end
@@ -34,12 +34,14 @@ module PoolParty
           "master_provision_master_task",
           "after_install_tasks",
           "custom_configure_tasks",
-          "run_provisioner_twice",
-          "master_configure_master_task"
+          "before_configuration_tasks",
+          "master_configure_master_task",
+          "run_provisioner_twice"
         ]#.map {|a| a.to_sym }
       end
       def master_configure_tasks
         [
+          "before_configuration_tasks",
           "master_configure_master_task"
         ]#.map {|a| a.to_sym }
       end
@@ -69,6 +71,7 @@ module PoolParty
           arr << "role 'master.#{@cloud.name}'.to_sym, '#{@cloud.master.ip}'"
           arr << "role :master, '#{@cloud.master.ip}'"
           arr << "role :slaves, '#{@cloud.nonmaster_nonterminated_instances.map{|a| a.ip}.join('", "')}'" if @cloud.nonmaster_nonterminated_instances.size > 0
+          arr << "role :single, '#{@instance.ip}'" if @instance && @instance.ip
         end.join("\n")
       end
       

data/lib/poolparty/provisioners/capistrano/recipies/base.rb

@@ -58,16 +58,17 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
     desc "Update rubygems"
     def update_rubygems
-      run "/usr/bin/gem update --system 2>1 > /dev/null && /usr/bin/gem update --system"
+      run "/usr/bin/gem update --system 2>1 > /dev/null;/usr/bin/gem update --system;echo 'gems updated'"
     end
     desc "Fix rubygems"
     def fix_rubygems
       # echo '#{open(::File.join(template_directory, "gem")).read}' > /usr/bin/gem &&
       # cp #{remote_storage_path}/gem /usr/bin/gem
       run <<-EOR
-        if gem -v; then echo "gem is working"; else cp #{remote_storage_path}/gem /usr/bin/gem; fi &&
-        /usr/bin/gem update --system 2>&1 > /dev/null;/usr/bin/gem update --system &&
-        if gem -v; then echo "gem is working"; else cp #{remote_storage_path}/gem /usr/bin/gem; fi
+        if gem -v; then echo "gem is working"; else cp #{remote_storage_path}/gem /usr/bin/gem; fi;
+        /usr/bin/gem update --system 2>&1 > /dev/null;/usr/bin/gem update --system;
+        if gem -v; then echo "gem is working"; else cp #{remote_storage_path}/gem /usr/bin/gem; fi;
+        echo 'gems updated!'
       EOR
     end
     desc "Upgrade system"

data/lib/poolparty/provisioners/capistrano/recipies/master.rb

@@ -97,7 +97,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
     desc "Move poolparty keys"
     def move_poolparty_keys
-      run "cp #{remote_storage_path}/#{@full_keypair_name} #{@remote_keypair_path}"
+      run "cp #{remote_storage_path}/#{full_keypair_name} #{remote_keypair_path}"
     end
   # end
 end

data/lib/poolparty/provisioners/capistrano/recipies/slave.rb

@@ -30,7 +30,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
     desc "Add master ip to hosts file"
     def add_master_to_hosts_file
-      run "if [ -z \"$(grep -v '#' /etc/hosts | grep 'master')\" ]; then echo '#{cloud.master.ip} puppet master' >> /etc/hosts; else echo 'host already set'; fi"
+      run "if [ -z \"$(grep -v '#' /etc/hosts | grep 'master' | grep '#{cloud.master.ip}' )\" ]; then echo '#{cloud.master.ip} puppet master' >> /etc/hosts; else echo 'host already set'; fi"
     end
     desc "Stop provisioner daemon"
     def stop_provisioner_daemon

data/lib/poolparty/version.rb

@@ -4,6 +4,12 @@ module PoolParty
     MINOR = 2
     TINY  = 89
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY].join('.')    
   end
+  class Version
+    def self.to_s
+      [VERSION::MAJOR, VERSION::MINOR, VERSION::TINY].join('.')
+    end
+  end
+  
 end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.88
+  version: 0.2.89
 platform: ruby
 authors: 
 - Ari Lerner
@@ -532,7 +532,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 02:30 12/16/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 16:58 12/16/08)
   
   To get started, run the generator:
   

data/spec/poolparty/provisioners/provisioner_base_spec.rb

@@ -9,6 +9,9 @@ describe "ProvisionerBase" do
     @pb = PoolParty::Provisioner::ProvisionerBase.new(@remote_instance, @cloud)
     stub_list_from_remote_for(@cloud)
     stub_remoting_methods_for(@cloud)
+    Kernel.stub!(:sleep).and_return true
+    @cloud.stub!(:when_no_pending_instances).and_return true
+    @cloud.stub!(:when_all_assigned_ips).and_return true
   end
   describe "class methods" do
     it "should have install" do

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.88</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.89</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.88
+  version: 0.2.89
 platform: ruby
 authors: 
 - Ari Lerner
@@ -532,7 +532,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 02:30 12/16/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 16:58 12/16/08)
   
   To get started, run the generator: