auser-poolparty 0.2.50 → 0.2.51

data/bin/server-start-client

@@ -12,7 +12,7 @@ o.loaded_clouds.each do |cloud|
   with_cloud(cloud) do
     
     boot_file = "#{Messenger.append_dir}/pm_client_rel-0.1"
-    command = Messenger.erl_command("client", "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}", 7050, 7050)
+    command = Messenger.erl_command("client", "-boot #{boot_file} #{noshell ? "" : "-detached -heart -noshell"}", 7050, 7050)
     
     vputs "Running #{command}"
     

data/bin/server-start-master

@@ -12,7 +12,7 @@ o.loaded_clouds.each do |cloud|
   with_cloud(cloud) do
     
     boot_file = "#{Messenger.append_dir}/pm_master_rel-0.1"
-    command = Messenger.erl_command("master", "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")
+    command = Messenger.erl_command("master", "-boot #{boot_file} #{noshell ? "" : "-noshell -detached -heart"}")
     
     vputs "Running #{command}"
     

data/bin/server-start-node

@@ -20,7 +20,7 @@ o.loaded_clouds.each do |cloud|
     # SECURITY RISK
     
     boot_file = "#{Messenger.append_dir}/pm_node_rel-0.1"
-    command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-detached -heart"} -- #{available_monitors.join(" ")}")
+    command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-noshell -detached -heart"} -- #{available_monitors.join(" ")}")
     
     vputs "Running #{command}"
     

data/lib/poolparty/base_packages/poolparty.rb

@@ -14,16 +14,16 @@ module PoolParty
         has_package(:name => "erlang-src")
         # has_package(:name => "yaws")
         
-        has_package(:name => "rubygems") do |g|
+        has_package(:name => "rubygems") do
           # These should be installed automagically by poolparty, but just in case
           # TODO: Fix the requires method with a helper
-          g.has_gempackage(:name => "flexmock", :download_url => "http://rubyforge.org/frs/download.php/42580/flexmock-0.8.3.gem")
-          g.has_gempackage(:name => "lockfile", :download_url => "http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem")
-          g.has_gempackage(:name => "logging", :download_url => "http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem", :requires => [get_gempackage("flexmock"), get_gempackage("lockfile")])          
+          has_gempackage(:name => "flexmock", :download_url => "http://rubyforge.org/frs/download.php/42580/flexmock-0.8.3.gem")
+          has_gempackage(:name => "lockfile", :download_url => "http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem")
+          has_gempackage(:name => "logging", :download_url => "http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem", :requires => [get_gempackage("flexmock"), get_gempackage("lockfile")])          
           
-          g.has_gempackage(:name => "rubyforge", :download_url => "http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem")
-          g.has_gempackage(:name => "hoe", :download_url => "http://rubyforge.org/frs/download.php/45685/hoe-1.8.2.gem", :version => "1.8", :requires => get_gempackage("rubyforge"))
-          g.has_gempackage(:name => "ZenTest", :download_url => "http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem", :requires => [get_gempackage("hoe"), get_gempackage("rubyforge")])
+          has_gempackage(:name => "rubyforge", :download_url => "http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem")
+          has_gempackage(:name => "hoe", :download_url => "http://rubyforge.org/frs/download.php/45685/hoe-1.8.2.gem", :version => "1.8", :requires => get_gempackage("rubyforge"))
+          has_gempackage(:name => "ZenTest", :download_url => "http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem", :requires => [get_gempackage("hoe"), get_gempackage("rubyforge")])
           
           has_gempackage(:name => "rake", :download_url => "http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem")
           has_gempackage(:name => "xml-simple", :download_url => "http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem")
@@ -40,11 +40,18 @@ module PoolParty
           
           has_gempackage(:name => "poolparty-latest", :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-latest"), :onlyif => "ps aux | grep beam | grep node")
-          has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"), :onlyif => "ps aux | grep beam | grep node")
+          has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger", :requires => get_gempackage("poolparty-latest"), :ifnot => "ps aux | grep beam | grep node")
+          has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node", :requires => get_exec("build_messenger"), :ifnot => "ps aux | grep beam | grep node")
           
         end
         
+        # execute_on_node do
+          has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
+            requires get_gempackage("poolparty-latest")
+            command(PoolParty::Remote::RemoteInstance.puppet_rerun_commad)
+          end
+        # end
+        
         # Cloud panel setup
         
         # has_directory(:name => "/var/www/cloudpanel")
@@ -64,20 +71,11 @@ module PoolParty
             requires get_gempackage("poolparty-latest")
             command(". /etc/profile && cloud-handle-load")
           end
-        end
-        execute_on_node do
-          has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
-            requires get_gempackage("poolparty-latest")
-            command(PoolParty::Remote::RemoteInstance.puppet_rerun_commad)
-          end
-        end
-        
-        # These are all requirements on the master
-        execute_on_master do
+          
           # TODO: Update this so it only runs when needed
-          has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger")], :onlyif => "ps aux | grep beam | grep master")
+          has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger")], :ifnot => "ps aux | grep beam | grep master")
           
-          has_exec(:name => "start client server", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger"), get_exec("start master messenger")], :onlyif => "ps aux | grep beam | grep client")
+          has_exec(:name => "start client server", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger"), get_exec("start master messenger")], :ifnot => "ps aux | grep beam | grep client")
           
           has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3", :requires => [get_gempackage("poolparty-latest"), get_cron("puppetd runner"), get_cron("Load handler"), get_exec("start master messenger"), get_service("haproxy"), get_exec("start client server")]})
           

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

@@ -125,11 +125,11 @@ wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-
       def start_puppetmaster
         <<-EOS
 . /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
-# Start it back up
-/etc/init.d/puppetmaster start #{unix_hide_string}
+# /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
+# # Start it back up
+# /etc/init.d/puppetmaster start #{unix_hide_string}
         EOS
       end
 

data/lib/poolparty/templates/puppetcleaner

@@ -5,5 +5,5 @@
 ps aux | grep puppetmaster | awk '{print $2}' | xargs kill
 /etc/init.d/puppetmaster stop
 rm -rf /etc/puppet/ssl
-puppetmasterd --verbose
 /etc/init.d/puppetmaster start
+puppetmasterd --verbose

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 50
+    TINY  = 51
 
     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.50
+  version: 0.2.51
 platform: ruby
 authors: 
 - Ari Lerner

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.50
+  version: 0.2.51
 platform: ruby
 authors: 
 - Ari Lerner