Merge "Remove ZooKeeperConnectionConfig class" into feature/zuulv3
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index a923ff1..ec88737 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -2180,14 +2180,6 @@
self.assertEqual('https://server/job/project-test2/0/',
status_jobs[2]['report_url'])
- @skip("Disabled for early v3 development")
- def test_merging_queues(self):
- "Test that transitively-connected change queues are merged"
- self.updateConfigLayout(
- 'tests/fixtures/layout-merge-queues.yaml')
- self.sched.reconfigure(self.config)
- self.assertEqual(len(self.sched.layout.pipelines['gate'].queues), 1)
-
def test_mutex(self):
"Test job mutexes"
self.updateConfigLayout('layout-mutex')
diff --git a/zuul/ansible/callback/zuul_stream.py b/zuul/ansible/callback/zuul_stream.py
index 9b8bccd..e6b3461 100644
--- a/zuul/ansible/callback/zuul_stream.py
+++ b/zuul/ansible/callback/zuul_stream.py
@@ -83,7 +83,16 @@
self._print_task_banner(task)
if task.action == 'command':
play_vars = self._play._variable_manager._hostvars
- for host in self._play.hosts:
+
+ hosts = self._play.hosts
+ if 'all' in hosts:
+ # NOTE(jamielennox): play.hosts is purely the list of hosts
+ # that was provided not interpretted by inventory. We don't
+ # have inventory access here but we can assume that 'all' is
+ # everything in hostvars.
+ hosts = play_vars.keys()
+
+ for host in hosts:
ip = play_vars[host]['ansible_host']
daemon_stamp = self._daemon_stamp % host
if not os.path.exists(daemon_stamp):