svn commit: r1373981 - in /incubator/ambari/trunk: CHANGES.txt hmc/ShellScripts/puppet_agent_install.sh

[hi...@apache.org]

Author: hitesh
Date: Thu Aug 16 19:00:36 2012
New Revision: 1373981

URL: http://svn.apache.org/viewvc?rev=1373981&view=rev
Log:
AMBARI-668. Ambari should install yum priorities plugin on all nodes to ensure repo priorities are adhered to. (Contributed by hitesh)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/hmc/ShellScripts/puppet_agent_install.sh

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1373981&r1=1373980&r2=1373981&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Aug 16 19:00:36 2012
@@ -147,6 +147,9 @@ Trunk (unreleased changes)
 
 Release 0.9.0
 
+  AMBARI-668. Ambari should install yum priorities plugin on all nodes to ensure repo
+  priorities are adhered to. (hitesh)
+
   AMBARI-618. Fix RAT warnings on docs directory (vinodkv via vikram)
 
   AMBARI-617. Missing some files in rat-excludes (vikram via vinodkv)

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=1373981&r1=1373980&r2=1373981&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/ShellScripts/puppet_agent_install.sh (original)
+++ incubator/ambari/trunk/hmc/ShellScripts/puppet_agent_install.sh Thu Aug 16 19:00:36 2012
@@ -219,6 +219,24 @@ else
   echo "Skipping epel check+install as local repo mode is enabled"
 fi
 
+echo "Installing yum priorities plugin"
+if [[ "x${osMajorVersion}" == "x5" ]]; then
+  out=`yum install -y yum-priorities`
+  ret=$?
+  if [[ "$ret" != "0" ]]; then
+    echo "$host:_ERROR_:retcode:[$ret], CMD:[$pp_cmd]: OUT:[$out]" >&2
+    exit 1
+  fi
+fi
+if [[ "x${osMajorVersion}" == "x6" ]]; then
+  out=`yum install -y yum-plugin-priorities`
+  ret=$?
+  if [[ "$ret" != "0" ]]; then
+    echo "$host:_ERROR_:retcode:[$ret], CMD:[$pp_cmd]: OUT:[$out]" >&2
+    exit 1
+  fi
+fi
+
 echo "Installing puppet using yum"
 out=`yum install -y hmc-agent`
 ret=$?