From 77162e95e49f489a3a62bca68f5027cf8b18ba70 Mon Sep 17 00:00:00 2001 From: Jeroen Hoekx Date: Mon, 29 Oct 2012 09:45:44 +0100 Subject: [PATCH 1/2] Send a host to runner executor instead of a letter. Discovered in #1463 . --- lib/ansible/runner/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index c65b07937bb..510a4489cae 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -652,7 +652,7 @@ class Runner(object): # We aren't iterating over all the hosts in this # group. So, just pick the first host in our group to # 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 # using the returned result. If we didn't do this we would # get false reports of dark hosts. From f963db6c2aa398cc995e591d43eaaf0a5541eb61 Mon Sep 17 00:00:00 2001 From: Jeroen Hoekx Date: Mon, 29 Oct 2012 10:57:13 +0100 Subject: [PATCH 2/2] Fix output of pause plugin. --- lib/ansible/runner/action_plugins/pause.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/runner/action_plugins/pause.py b/lib/ansible/runner/action_plugins/pause.py index 2a7c6708683..6c9f732bd6c 100644 --- a/lib/ansible/runner/action_plugins/pause.py +++ b/lib/ansible/runner/action_plugins/pause.py @@ -48,7 +48,7 @@ class ActionModule(object): def run(self, conn, tmp, module_name, module_args, inject): ''' 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)) # Are 'minutes' or 'seconds' keys that exist in 'args'?