svn commit: r1354271 - in /incubator/ambari/trunk: CHANGES.txt hmc/php/frontend/addNodes/verifyAndUpdateNodesInfo.php

[hi...@apache.org]

Author: hitesh
Date: Tue Jun 26 22:23:45 2012
New Revision: 1354271

URL: http://svn.apache.org/viewvc?rev=1354271&view=rev
Log:
AMBARI-547. Change os type check during node bootstrap to allow for CentOS6/RHEL6 nodes (Contributed by Hitesh)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/hmc/php/frontend/addNodes/verifyAndUpdateNodesInfo.php

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1354271&r1=1354270&r2=1354271&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Jun 26 22:23:45 2012
@@ -6,6 +6,9 @@ characters wide.
 
 Release 1.0.0 - unreleased
 
+  AMBARI-547. Change os type check during node bootstrap to allow for
+  CentOS6/RHEL6 nodes (hitesh)
+
   AMBARI-549. rpm should have a dependency on php-posix (hitesh)
 
   AMBARI-578. Custom Config page: don't allow form submission if there are

Modified: incubator/ambari/trunk/hmc/php/frontend/addNodes/verifyAndUpdateNodesInfo.php
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/php/frontend/addNodes/verifyAndUpdateNodesInfo.php?rev=1354271&r1=1354270&r2=1354271&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/php/frontend/addNodes/verifyAndUpdateNodesInfo.php (original)
+++ incubator/ambari/trunk/hmc/php/frontend/addNodes/verifyAndUpdateNodesInfo.php Tue Jun 26 22:23:45 2012
@@ -288,7 +288,9 @@ if ($dirHandle = opendir($prevOutputDir)
 
       if ($nodeStatus == "SUCCESS") {
         if ($thisHostArray["osType"] != "redhatenterpriselinuxserver5"
-            && $thisHostArray["osType"] != "centos5") {
+            && $thisHostArray["osType"] != "centos5"
+            && $thisHostArray["osType"] != "redhatenterpriselinuxserver6"
+            && $thisHostArray["osType"] != "centos6") {
           $thisHostArray["badHealthReason"] = "Unsupported OS";
           $finalOpStatus = "FAILED";
           $nodeStatus = "FAILED";