auser-poolparty 0.2.52 → 0.2.53

data/bin/cloud-provision

@@ -5,7 +5,7 @@ require "poolpartycl"
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-p', '--slave', 'Provision slave (default: false)')    { optioner.provision_slave true }
-  opts.on('-i num', '--id num', 'Instance num to provision')    { |i| optioner.instance_num i }
+  opts.on('-i num', '--id num', 'Instance num to provision')    { |i| optioner.instance_number i }
 end
 
 o.loaded_clouds.each do |cloud|

data/bin/server-start-client

@@ -16,7 +16,7 @@ o.loaded_clouds.each do |cloud|
     
     vputs "Running #{command}"
     
-    Kernel.system "exec #{command}" unless testing
+    Kernel.system "#{command}" unless testing
   end  
   
 end

data/bin/server-start-master

@@ -16,7 +16,7 @@ o.loaded_clouds.each do |cloud|
     
     vputs "Running #{command}"
     
-    Kernel.system "exec #{command}" unless testing
+    Kernel.system "#{command}" unless testing
   end  
   
 end

data/bin/server-start-node

@@ -15,7 +15,7 @@ available_monitors = PoolParty::Monitors.available_monitors
 
 o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing, :hostname => @hostname, :noshell => o.noshell }) do
+  with_cloud(cloud) do
     # TODO: Change this to be app specfic
     # SECURITY RISK
     
@@ -24,7 +24,7 @@ o.loaded_clouds.each do |cloud|
     
     vputs "Running #{command}"
     
-    Kernel.system "exec #{command}" unless testing
+    Kernel.system "#{command}" unless testing
   end  
   
 end

data/lib/poolparty/base_packages/haproxy.rb

@@ -26,7 +26,7 @@ module PoolParty
           # Service is required
           has_service(:name => "haproxy", :ensures => "running")
           
-          has_exec(:name => "reloadhaproxy", :command => "/etc/init.d/haproxy reload", :requires => get_package("haproxy"))
+          # has_exec(:name => "reloadhaproxy", :command => "/etc/init.d/haproxy reload", :requires => get_package("haproxy"))
 
           # These can also be passed in via hash
           has_remotefile(:name => "/etc/haproxy.cfg") do

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

@@ -33,6 +33,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}
 rm -rf /etc/puppet/ssl
         EOS

data/lib/poolparty/monitors/base_monitor.rb

@@ -21,7 +21,7 @@ module PoolParty
     
     def self.register_monitor(*args)
       args.each do |arg|
-        (available_monitors << "#{arg}".downcase.to_sym)
+        (available_monitors << "#{arg}".downcase.to_sym unless available_monitors.include?("#{arg}".downcase.to_sym))
         
         InstanceMethods.module_eval "def #{arg}; @#{arg} ||= messenger_send!(\"get_current_load #{arg}\").to_f rescue -1.0; end"
       end

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 52
+    TINY  = 53
 
     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.52
+  version: 0.2.53
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-10 00:00:00 -08:00
+date: 2008-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.52
+  version: 0.2.53
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-10 00:00:00 -08:00
+date: 2008-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency