auser-poolparty 0.2.77 → 0.2.78

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 08:35 12/05/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 09:44 12/05/08)
 
 To get started, run the generator:
 

data/lib/poolparty/base_packages/poolparty.rb

@@ -102,6 +102,8 @@ module PoolParty
           
           has_cron({:name => "maintain script", :command => ". /etc/profile && cloud-maintain -n #{cloud.name}", :minute => "*/3", :requires => [get_gempackage("poolparty"), get_cron("puppetd runner"), get_cron("Load handler"), get_service("haproxy")]})
           
+          has_cron(:name => "ensure puppetmaster is running", :command => ". /etc/profile && puppetmasterd --verbose", :hour => "0")
+          
         end        
         # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)
       end

data/lib/poolparty/helpers/provisioner_base.rb

@@ -216,6 +216,7 @@ module PoolParty
           make_logger_directory,
           install_puppet,
           fix_rubygems,
+          setup_system_for_poolparty,
           custom_install_tasks
         ] << install_tasks
       end
@@ -352,6 +353,9 @@ fi
           mkdir -p #{Base.base_config_directory}/ssl/private_keys
           mkdir -p #{Base.base_config_directory}/ssl/certs
           mkdir -p #{Base.base_config_directory}/ssl/public_keys
+          
+          cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetrerun /usr/bin/puppetrerun
+          chmod +x /usr/bin/puppetrerun
         EOS
       end
     end

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

@@ -142,9 +142,7 @@ ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/poolparty
       def run_first_time
 <<-EOE
 echo "Running first time run"
-cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetrerun /usr/bin/puppetrerun
 cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetrunner /usr/bin/puppetrunner
-chmod +x /usr/bin/puppetrerun
 chmod +x /usr/bin/puppetrunner
 EOE
       end

data/lib/poolparty/templates/puppet.conf

@@ -22,4 +22,5 @@
   server = master
   
 [puppetmasterd]
+  certname = master
   server = master

data/lib/poolparty/templates/puppetrerun

@@ -2,15 +2,14 @@
 
 . /etc/profile
 if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master)]; then
-  echo "Run successfully"
+  echo "Run successfully" && exit 0
   else
   echo "Clearing old certs"
   HN=`hostname`
   if [[ $HN == "master" ]]; then
-      ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/poolparty/ssl;puppetmasterd --verbose
-      /etc/init.d/puppetmaster start
-      /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+      ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/poolparty/ssl;/etc/init.d/puppetmaster start
+      /etc/init.d/puppetmaster start && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
     else
-      cd /etc/poolparty/ssl && rm -rf *;/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+      rm -rf /etc/poolparty/ssl/*;/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
   fi
 fi

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.77
+  version: 0.2.78
 platform: ruby
 authors: 
 - Ari Lerner
@@ -511,7 +511,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 08:35 12/05/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 09:44 12/05/08)
   
   To get started, run the generator:
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.77
+  version: 0.2.78
 platform: ruby
 authors: 
 - Ari Lerner
@@ -511,7 +511,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 08:35 12/05/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 09:44 12/05/08)
   
   To get started, run the generator: