incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgog...@apache.org
Subject svn commit: r1338521 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/ShellScripts/puppet_agent_install.sh
Date Tue, 15 May 2012 03:14:52 GMT
Author: vgogate
Date: Tue May 15 03:14:52 2012
New Revision: 1338521

URL: http://svn.apache.org/viewvc?rev=1338521&view=rev
Log:
AMBARI-236. Increase puppet agent timeout by Richard

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/ShellScripts/puppet_agent_install.sh

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1338521&r1=1338520&r2=1338521&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Tue May 15 03:14:52 2012
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-236. Increase puppet agent timeout. (Jitendra Pandey via vgogate)
+
   AMBARI-235. Ordering problem when using hdp-ganglia::monitor_and_server (Richard Pelavin
by vgogate)
 
   AMBARI-234. Typo in javascript (vikran Dixit via vgogate)

Modified: incubator/ambari/branches/ambari-186/hmc/ShellScripts/puppet_agent_install.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/ShellScripts/puppet_agent_install.sh?rev=1338521&r1=1338520&r2=1338521&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/ShellScripts/puppet_agent_install.sh (original)
+++ incubator/ambari/branches/ambari-186/hmc/ShellScripts/puppet_agent_install.sh Tue May
15 03:14:52 2012
@@ -85,7 +85,7 @@ fi
 #TODO clean this up for better fix. For now make sure we stop puppet agent. The issue here
is we do not know if we started this puppet agent during our run or not.
 out=`service puppet stop`
 ret=$?
-out=`puppet agent --verbose --confdir=/etc/puppet/agent --listen --runinterval 5 --server
$master --report --no-client --waitforcert 10 --debug --logdest=/var/log/puppet_agent.log
--httplog /var/log/puppet_agent_http.log --autoflush 2>&1`
+out=`puppet agent --verbose --confdir=/etc/puppet/agent --listen --runinterval 5 --server
$master --report --no-client --waitforcert 10 --configtimeout 600 --debug --logdest=/var/log/puppet_agent.log
--httplog /var/log/puppet_agent_http.log --autoflush 2>&1`
 ret=$?
 if [[ "$ret" != "0" ]]; then
   echo "$host:_ERROR_:retcode:[$ret], CMD:[$pp_cmd]: OUT:[$out]" >&2



Mime
View raw message