slave.rb in auser-poolparty-0.2.16

- old
+ new

@@ -17,10 +17,11 @@
 
       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          
@@ -30,10 +31,12 @@
 
       # /etc/init.d/puppetmasterd stop
       # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
         <<-EOS
+          ps aux | grep "puppetmasterd" | awk '{print $2}' | xargs kill
           rm -rf /etc/puppet/ssl*
+          puppetd --test  2>&1 &
         EOS
       end
       
       def master_ip
         @cloud.master.ip
\ No newline at end of file