auser-poolparty 0.2.36 → 0.2.37

data/Manifest.txt

@@ -236,6 +236,7 @@ lib/poolparty/templates/namespaceauth.conf
 lib/poolparty/templates/poolparty.monitor
 lib/poolparty/templates/puppet.conf
 lib/poolparty/templates/puppetcleaner
+lib/poolparty/templates/puppetrerun
 lib/poolparty/version.rb
 lib/poolpartycl.rb
 poolparty.gemspec

data/lib/poolparty/base_packages/haproxy.rb

@@ -17,7 +17,7 @@ module PoolParty
           end
 
           # Service is required
-          has_service(:name => "haproxy")
+          has_service(:name => "haproxy", :ensures => "running")
 
           # Tempalte variables
           variable(:name => "name_haproxy", :value => "#{cloud.name}")

data/lib/poolparty/base_packages/poolparty.rb

@@ -29,11 +29,10 @@ module PoolParty
           has_gempackage(:name => "ruby2ruby", :download_url => "http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem", :requires => get_gempackage("ParseTree"))
           
           has_gempackage(:name => "activesupport", :download_url => "http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem")
-
-          has_gempackage(:name => "aska", :download_url => "http://github.com/auser/aska/tree/master%2Fpkg%2Faska-latest.gem?raw=true", :requires => get_gempackage("ruby2ruby"))            
+ 
           has_gempackage(:name => "RubyInline", :download_url => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem")
           
-          has_gempackage(:name => "poolparty", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("aska"), get_gempackage("ParseTree")])
+          has_gempackage(:name => "poolparty", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("ParseTree")])
           
           has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty"))
           has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"))
@@ -62,6 +61,10 @@ module PoolParty
             mode 744
             template File.join(File.dirname(__FILE__), "..", "templates/puppetcleaner")
           end
+          has_remotefile(:name => "/usr/bin/puppetrerun") do
+            mode 744
+            template File.join(File.dirname(__FILE__), "..", "templates/puppetrerun")
+          end
         end
         
         # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)

data/lib/poolparty/helpers/provisioner_base.rb

@@ -139,7 +139,7 @@ if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; fi
         @cloud.run_command_on(command, @cloud.master) unless testing
       end
       def process_reconfigure!(testing=false)        
-        @cloud.run_command_on("puppetd --test  2>&1 &", @instance) unless testing
+        @cloud.run_command_on(RemoteInstance.puppet_runner_command, @instance) unless testing
       end
       def setup_runner(force=false)
         @cloud.prepare_to_configuration

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

@@ -132,11 +132,10 @@ wget http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem -O rake.gem 2>&1
 wget http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem -O sexp_processor.gem 2>&1
 wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true -O poolparty-latest.gem 2>&1
 wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-ec2.gem 2>&1
-wget http://github.com/auser/aska/tree/master%2Fpkg%2Faska-latest.gem?raw=true -O aska.gem 2>&1
 
 #{
   %w(rake lockfile rubyforge hoe zentest sexp_processor flexmock logging activesupport 
-      RubyInline ParseTree ruby2ruby xml-simple aska poolparty-latest amazon-ec2).map do |dep|
+      RubyInline ParseTree ruby2ruby xml-simple poolparty-latest amazon-ec2).map do |dep|
     "gem install --ignore-dependencies -y --no-ri --no-rdoc #{dep}.gem"
   end.join("\n")
 }

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

@@ -33,8 +33,9 @@ module PoolParty
       # /etc/init.d/puppetmasterd stop
       # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
-        <<-EOS          
-          /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1          
+        <<-EOS
+          rm -rf /etc/puppet/ssl
+          /usr/bin/puppetrerun
         EOS
       end
       

data/lib/poolparty/net/remote_instance.rb

@@ -69,7 +69,7 @@ module PoolParty
       end
       # Commands for the servers
       def self.puppet_runner_command
-        ". /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1"
+        "/usr/bin/puppetrerun 2>&1 > /dev/null"
       end
     end
     

data/lib/poolparty/net/remoter.rb

@@ -126,8 +126,7 @@ module PoolParty
       # A convenience method for waiting until there are no more
       # pending instances and then running the block
       def when_no_pending_instances(&block)
-        reset!
-        vputs "Waiting for there to be no pending instances..."
+        reset!        
         if list_of_pending_instances.size == 0
           block.call if block
         else
@@ -155,8 +154,10 @@ module PoolParty
         vputs "Requesting to launch new instance"
         request_launch_new_instances(1) if list_of_pending_instances.size.zero? && can_start_a_new_instance? && !is_master_running?
         
+        vputs "Waiting for there to be no pending instances..."
         when_no_pending_instances do
           wait "20.seconds"
+          vputs ""
           vputs "Provisioning master..."
           hide_output { Provisioner.provision_master(self, testing) }
           PoolParty::Provisioner.reconfigure_master(self, !testing)

data/lib/poolparty/templates/puppetrerun

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+. /etc/profile
+rm -rf /etc/puppet/ssl
+/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master  2>&1 > /dev/null

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 36
+    TINY  = 37
 
     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.36
+  version: 0.2.37
 platform: ruby
 authors: 
 - Ari Lerner
@@ -336,6 +336,7 @@ files:
 - lib/poolparty/templates/poolparty.monitor
 - lib/poolparty/templates/puppet.conf
 - lib/poolparty/templates/puppetcleaner
+- lib/poolparty/templates/puppetrerun
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb
 - poolparty.gemspec

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.36</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.37</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.36
+  version: 0.2.37
 platform: ruby
 authors: 
 - Ari Lerner
@@ -336,6 +336,7 @@ files:
 - lib/poolparty/templates/poolparty.monitor
 - lib/poolparty/templates/puppet.conf
 - lib/poolparty/templates/puppetcleaner
+- lib/poolparty/templates/puppetrerun
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb
 - poolparty.gemspec