svn commit: r1378400 - in /incubator/ambari/trunk: CHANGES.txt hmc/ShellScripts/puppet_agent_install.sh hmc/package/rpm/SOURCES/ambari-agent.init.in

[ma...@apache.org]

Author: mahadev
Date: Wed Aug 29 00:24:31 2012
New Revision: 1378400

URL: http://svn.apache.org/viewvc?rev=1378400&view=rev
Log:
AMBARI-689. Fix ambari agent init.d scripts and the bootstrapping. (mahadev)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/hmc/ShellScripts/puppet_agent_install.sh
    incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari-agent.init.in

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1378400&r1=1378399&r2=1378400&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Aug 29 00:24:31 2012
@@ -95,6 +95,9 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    AMBARI-689. Fix ambari agent init.d scripts and the bootstrapping.
+    (mahadev)
+
     AMBARI-688. Documentation typo: jce_policy-6.zip needs to be uploaded to
     Ambari master, not jce_policy-6.jar (yusaku)
 

Modified: incubator/ambari/trunk/hmc/ShellScripts/puppet_agent_install.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/ShellScripts/puppet_agent_install.sh?rev=1378400&r1=1378399&r2=1378400&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/ShellScripts/puppet_agent_install.sh (original)
+++ incubator/ambari/trunk/hmc/ShellScripts/puppet_agent_install.sh Wed Aug 29 00:24:31 2012
@@ -238,7 +238,7 @@ if [[ "x${osMajorVersion}" == "x6" ]]; t
 fi
 
 echo "Installing puppet using yum"
-out=`yum install -y hmc-agent`
+out=`yum install -y ambari-agent`
 ret=$?
 if [[ "$ret" != "0" ]]; then
   echo "$host:_ERROR_:retcode:[$ret], CMD:[$pp_cmd]: OUT:[$out]" >&2
@@ -252,7 +252,7 @@ if [[ "$ret" != "0" ]]; then
   echo "$host:_ERROR_:retcode:[$ret], CMD:[$pp_cmd]: OUT:[$out]" >&2
   exit 1
 fi
-out=`echo $master > /etc/hmc/hmc-agent.conf`
+out=`echo $master > /etc/hmc/ambari-agent.conf`
 out=`mkdir -p /etc/puppet/agent 2>&1`
 agent_auth_conf="path /run\nauth any\nallow $master\n\npath /\nauth any"
 out=`echo -e $agent_auth_conf > /etc/puppet/agent/auth.conf`
@@ -267,18 +267,18 @@ 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.
 echo "Stopping puppet agent using service stop command"
-out=`service hmc-agent stop`
+out=`service ambari-agent stop`
 ret=$?
 
 echo "Starting puppet agent for HMC"
-out=`service hmc-agent start`
+out=`service ambari-agent start`
 ret=$?
 if [[ "$ret" != "0" ]]; then
   echo "$host:_ERROR_:retcode:[$ret], CMD:[$pp_cmd]: OUT:[$out]" >&2
   exit 1
 fi
 echo "Setting chkconfig for HMC"
-out=`chkconfig --add hmc-agent`
+out=`chkconfig --add ambari-agent`
 ret=$?
 #if [[ "$ret" != "0" ]]; then
 #  echo "$host:_ERROR_:retcode:[$ret], CMD:[$pp_cmd]: OUT:[$out]" >&2

Modified: incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari-agent.init.in
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari-agent.init.in?rev=1378400&r1=1378399&r2=1378400&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari-agent.init.in (original)
+++ incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari-agent.init.in Wed Aug 29 00:24:31 2012
@@ -47,7 +47,7 @@ if status | grep -q -- '-p' 2>/dev/null;
     daemonopts="--pidfile $pidfile"
     pidopts="-p $pidfile"
 fi
-hmc_server=`cat /etc/hmc/hmc-agent.conf`
+hmc_server=`cat /etc/hmc/ambari-agent.conf`
 PUPPET_OPTS="agent --verbose --confdir=/etc/puppet/agent --listen --runinterval 5 --server $hmc_server --report --no-client --waitforcert 10 --configtimeout 600 --debug --logdest=/var/log/puppet_agent.log --httplog /var/log/puppet_agent_http.log --autoflush --use_cached_catalog"
 
 start() {