AMBARI-1990. After successful registration, going back to the Confirm Hosts or re-installing agents from Install Options page causes host registration to fail. (smohanty)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1469943 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -774,6 +774,10 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1990. After successful registration, going back to the Confirm Hosts
+ or re-installing agents from Install Options page causes host registration
+ to fail. (smohanty)
+
  AMBARI-1991. Remove unused python files from ambari-agent. (smohanty)
 
  AMBARI-1984. WebHCat log and pid dirs configs should be under WebHCat >

ambari-server/src/main/python/setupAgent.py

@@ -81,11 +81,6 @@ def runAgent(passPhrase):
   os.environ[AMBARI_PASSPHRASE_VAR] = passPhrase
   subprocess.call("/usr/sbin/ambari-agent start", shell=True)
   try:
-    # print this to the log.  despite the directory, machine.py works with Python 2.4
-    ret = execOsCommand(["python", "/usr/lib/python2.6/site-packages/ambari_agent/machine.py"])
-    if not 0 == ret['exitstatus']:
-      return ret['exitstatus']
-    print ret['log']
 
     ret = execOsCommand(["tail", "-20", "/var/log/ambari-agent/ambari-agent.log"])
     if not 0 == ret['exitstatus']: