]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
testing: fix logic in determining Hadoop master
authorJoe Buck <jbbuck@gmail.com>
Wed, 6 Mar 2013 01:55:32 +0000 (17:55 -0800)
committerJoe Buck <jbbuck@gmail.com>
Wed, 6 Mar 2013 02:48:09 +0000 (18:48 -0800)
Signed-off-by: Joe Buck <jbbuck@gmail.com>
teuthology/task/hadoop.py

index 947782e946b31eab1f6298ffb5ab2c5e2168f4fc..2a36549a09d59e836a4bfcf09f2e9ac7544cace9 100644 (file)
@@ -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