From: Joe Buck <jbbuck@gmail.com>
Date: Wed, 6 Mar 2013 01:55:32 +0000 (-0800)
Subject: testing: fix logic in determining Hadoop master
X-Git-Tag: 1.1.0~2272
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da1e63bdddf515a8f46f7e50b604b9bf4167e6db;p=teuthology.git

testing: fix logic in determining Hadoop master

Signed-off-by: Joe Buck <jbbuck@gmail.com>
---

diff --git a/teuthology/task/hadoop.py b/teuthology/task/hadoop.py
index 947782e94..2a36549a0 100644
--- a/teuthology/task/hadoop.py
+++ b/teuthology/task/hadoop.py
@@ -166,12 +166,12 @@ def write_slaves(ctx):
 def write_master(ctx):
     mastersFile = "{tdir}/hadoop/conf/masters".format(tdir=teuthology.get_testdir(ctx))
     master = _get_master(ctx)
-    remote, _ = master
+    master_remote, _ = master
 
 
     hadoopNodes = ctx.cluster.only(teuthology.is_type('hadoop'))
     for remote, roles_for_host in hadoopNodes.remotes.iteritems():
-        teuthology.write_file(remote, mastersFile, '{remote}\n'.format(remote=remote.ssh.get_transport().getpeername()[0]))
+        teuthology.write_file(remote, mastersFile, '{master_host}\n'.format(master_host=master_remote.ssh.get_transport().getpeername()[0]))
         log.info("wrote file: " + mastersFile + " to host: " + str(remote))
 
 ## Call the various functions that configure Hadoop