External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 22:46:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Handle both string and list hosts in our hosts->name conversion

Browse Source 
Base our play.name fix off of what Ansible will be doing in the next
release: e2d2798a42
This commit is contained in:
Akita Noek
2016-02-25 11:38:09 -05:00
parent 26d11b2fb7
commit 5dc164bb76
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/plugins/callback/job_event_callback.py
View File

@@ -465,8 +465,11 @@ class JobCallbackModule(BaseCallbackModule):
setattr(self, 'play', play) setattr(self, 'play', play)
# Ansible 2.0.0.2 doesn't default .name to hosts like it did in 1.9.4, # Ansible 2.0.0.2 doesn't default .name to hosts like it did in 1.9.4,
# though that default will likely return in a future version of Ansible. # though that default will likely return in a future version of Ansible.
if not hasattr(play, 'name') or play.name == '': if (not hasattr(play, 'name') or not play.name) and hasattr(play, 'hosts'):
play.name = ', '.join(play.hosts) if isinstance(play.hosts, list):
play.name = ','.join(play.hosts)
else:
play.name = play.hosts
self._log_event('playbook_on_play_start', name=play.name, self._log_event('playbook_on_play_start', name=play.name,
pattern=play.hosts) pattern=play.hosts)