lib/poolparty/helpers/provisioners/slave.rb in auser-poolparty-0.2.58 vs lib/poolparty/helpers/provisioners/slave.rb in auser-poolparty-0.2.59

@@ -13,10 +13,16 @@
       def configure_tasks
         [          
           start_puppet
         ]
       end
+      
+      def setup_poolparty
+        <<-EOE
+echo "#{open(File.join(template_directory, "puppetrun")).read}" > /usr/bin/puppetrun
+        EOE
+      end
 
       def setup_puppet
         <<-EOE
           if [ -z "$(grep -v '#' /etc/hosts | grep 'master')" ]; then echo "#{master_ip} puppet master" >> /etc/hosts; else echo "host already set"; fi
           cp #{Base.remote_storage_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
@@ -32,19 +38,19 @@
       end
       
       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} &
+/bin/sh /usr/bin/puppetrerun
 rm -rf /etc/puppet/ssl
         EOS
       end
 
       # /etc/init.d/puppetmasterd stop
       # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
         <<-EOS
-. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master #{unix_hide_string} &
+/bin/sh /usr/bin/puppetrerun
         EOS
       end
       
       def master_ip
         @cloud.master.ip
\ No newline at end of file