lib/poolparty/helpers/provisioners/slave.rb in auser-poolparty-0.2.39 vs lib/poolparty/helpers/provisioners/slave.rb in auser-poolparty-0.2.40

@@ -17,25 +17,26 @@
 
       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
-          echo 'DAEMON_OPTS="-w 120 --fqdn #{@instance.name} --server master"' > /etc/default/puppet
         EOE
       end
 
       def setup_configs
         <<-EOS          
           echo "#{open(File.join(template_directory, "puppet.conf")).read}" > /etc/puppet/puppet.conf
-          /usr/bin/puppetrerun
+          /etc/init.d/puppetmaster stop
+          # /usr/bin/puppetrerun
         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 2>&1
+. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master  2>&1 > /dev/null
+. /etc/profile && /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master  2>&1 > /dev/null &
         EOS
       end
       
       def master_ip
         @cloud.master.ip
\ No newline at end of file