Merge pull request #1472 from jhoekx/action-host-letter

Send a host to runner executor instead of a letter.
pull/1648/head
Michael DeHaan 12 years ago
commit ea8cb0b2e9

@ -652,7 +652,7 @@ class Runner(object):
# We aren't iterating over all the hosts in this # We aren't iterating over all the hosts in this
# group. So, just pick the first host in our group to # group. So, just pick the first host in our group to
# construct the conn object with. # construct the conn object with.
result_data = self._executor(hosts[0][1]).result result_data = self._executor(hosts[0]).result
# Create a ResultData item for each host in this group # Create a ResultData item for each host in this group
# using the returned result. If we didn't do this we would # using the returned result. If we didn't do this we would
# get false reports of dark hosts. # get false reports of dark hosts.

@ -48,7 +48,7 @@ class ActionModule(object):
def run(self, conn, tmp, module_name, module_args, inject): def run(self, conn, tmp, module_name, module_args, inject):
''' run the pause actionmodule ''' ''' run the pause actionmodule '''
hosts = ', '.join(map(lambda x: x[1], self.runner.host_set)) hosts = ', '.join(self.runner.host_set)
args = parse_kv(template(self.runner.basedir, module_args, inject)) args = parse_kv(template(self.runner.basedir, module_args, inject))
# Are 'minutes' or 'seconds' keys that exist in 'args'? # Are 'minutes' or 'seconds' keys that exist in 'args'?

Loading…
Cancel
Save