You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/06 01:39:44 UTC
svn commit: r1346667 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/php/conf/Config.inc hmc/puppet/modules/puppetApply.sh
Author: vikram
Date: Tue Jun 5 23:39:44 2012
New Revision: 1346667
URL: http://svn.apache.org/viewvc?rev=1346667&view=rev
Log:
AMBARI-356. Log output to console slows puppet run. (Contributed by Jitendra)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/php/conf/Config.inc
incubator/ambari/branches/ambari-186/hmc/puppet/modules/puppetApply.sh
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1346667&r1=1346666&r2=1346667&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Tue Jun 5 23:39:44 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-356. Log output to console slows puppet run. (Jitendra via Vikram)
+
AMBARI-359. invalid parameter java_needed during uninstall (Ramya via Vikram)
AMBARI-354. hmc rpm on install must backup the database (Suresh via Vikram)
Modified: incubator/ambari/branches/ambari-186/hmc/php/conf/Config.inc
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/conf/Config.inc?rev=1346667&r1=1346666&r2=1346667&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/conf/Config.inc (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/conf/Config.inc Tue Jun 5 23:39:44 2012
@@ -12,7 +12,7 @@ $GLOBALS["puppetMaxParallelKicks"] = 10;
$GLOBALS["puppetManifestDir"] = "/etc/puppet/master/modules/catalog/files/";
$GLOBALS["puppetKickVersionFile"] = "/var/lib/puppet/puppet_kick_version.txt";
$GLOBALS["puppetReportsDir"] = "/var/lib/puppet/reports";
-$GLOBALS["puppetKickTimeout"] = 180;
+$GLOBALS["puppetKickTimeout"] = 120;
$GLOBALS["puppetModulesDirectory"] = "/etc/puppet/agent/modules";
$GLOBALS["manifestloaderFile"] = "/etc/puppet/master/manifestloader/site.pp";
$GLOBALS["manifestloaderDestinationDir"] = "/etc/puppet/master/manifests";
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/puppetApply.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/puppetApply.sh?rev=1346667&r1=1346666&r2=1346667&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/puppetApply.sh (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/puppetApply.sh Tue Jun 5 23:39:44 2012
@@ -1,5 +1,6 @@
-puppet apply --confdir=/etc/puppet/agent --logdest=console --debug --autoflush --detailed-exitcodes /etc/puppet/agent/site.pp
+puppet apply --confdir=/etc/puppet/agent --logdest=/var/log/puppet_apply.log --debug --autoflush --detailed-exitcodes /etc/puppet/agent/site.pp
ret=$?
+cat /var/log/puppet_apply.log
if [ "$ret" == "0" ] || [ "$ret" == "2" ]; then
exit 0
else