Merge pull request #208 from jamezpolley/master

slippycheeze · slippycheeze · commit 70141e9fc4e0 · 2012-10-15T11:11:48.000-07:00
Capture output of puppet_init.sh in a logfile on the node, don't nohup the agent.
diff --git a/lib/project_razor/broker/puppet.rb b/lib/project_razor/broker/puppet.rb
@@ -55,7 +55,7 @@ def init_agent(options={})
         Net::SSH.start(options[:ipaddress], options[:username], { :password => options[:password], :user_known_hosts_file => '/dev/null'} ) do |session|
           logger.debug "Copy: #{session.exec! "echo \"#{@puppet_script}\" > /tmp/puppet_init.sh" }"
           logger.debug "Chmod: #{session.exec! "chmod +x /tmp/puppet_init.sh"}"
-          @run_script_str << session.exec!("bash /tmp/puppet_init.sh")
+          @run_script_str << session.exec!("bash /tmp/puppet_init.sh |& tee /tmp/puppet_init.out")
           @run_script_str.split("\n").each do |line|
             logger.debug "puppet script: #{line}"
           end
diff --git a/lib/project_razor/broker/puppet/agent_install.erb b/lib/project_razor/broker/puppet/agent_install.erb
@@ -37,9 +37,8 @@ EOFPUPPETDEFAULT
     fi
 }
 
-function start_puppet() {
+function run_agent() {
     puppet agent -t
-    /usr/bin/nohup puppet agent &
 }
 
 #This fuction is not called if no custom facts are given
@@ -58,7 +57,7 @@ function provision_puppet() {
     install_puppet
     configure_puppet
     <%= 'facts_dot_d' if @options[:metadata] %>
-    start_puppet
+    run_agent
     echo Puppet installation finished!
     exit 0
 }

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,8 @@ EOFPUPPETDEFAULT`
`37`	`37`	`fi`
`38`	`38`	`}`
`39`	`39`
`40`		`-function start_puppet() {`
	`40`	`+function run_agent() {`
`41`	`41`	`puppet agent -t`
`42`		`- /usr/bin/nohup puppet agent &`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`#This fuction is not called if no custom facts are given`
`@@ -58,7 +57,7 @@ function provision_puppet() {`
`58`	`57`	`install_puppet`
`59`	`58`	`configure_puppet`
`60`	`59`	`<%= 'facts_dot_d' if @options[:metadata] %>`
`61`		`- start_puppet`
	`60`	`+ run_agent`
`62`	`61`	`echo Puppet installation finished!`
`63`	`62`	`exit 0`
`64`	`63`	`}`