zuul
/
zuul
Code Issues Proposed changes

Merge "Extract get_playhosts listing in zuul_stream to a method" into feature/zuulv3

This commit is contained in:
Jenkins 2017-06-15 21:57:37 +00:00 committed by Gerrit Code Review
parent df58192624 0a6c89e550
commit c819ae14f9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zuul/ansible/callback/zuul_stream.py
View File

@ -159,14 +159,7 @@ class CallbackModule(default.CallbackModule):
task.args['zuul_log_id'] = log_id
play_vars = self._play._variable_manager._hostvars
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()
hosts = self._get_play_hosts()
for host in hosts:
ip = play_vars[host].get(
'ansible_host', play_vars[host].get(
@ -265,6 +258,17 @@ class CallbackModule(default.CallbackModule):
self._log(msg)
return task
def _get_play_hosts(self):
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.
play_vars = self._play._variable_manager._hostvars
hosts = play_vars.keys()
return hosts
def _log_message(self, result, msg, status="ok"):
hostname = self._get_hostname(result)
self._log("{host} | {status}: {msg}".format(