summaryrefslogtreecommitdiff
path: root/playbooks
diff options
context:
space:
mode:
authorTobias Henkel <tobias.henkel@bmw-carit.de>2018-06-14 09:07:25 +0200
committerTobias Henkel <tobias.henkel@bmw-carit.de>2018-06-14 12:27:59 +0200
commit72dd0e82c23d7d5cc93429d6a318e57944dc2a64 (patch)
tree3192dcd14b696ef5a98733d5818630cfb0c1b511 /playbooks
parentf4e97aa5b2f97c5f5b0aa7f575708964629b3b0f (diff)
downloadzuul-72dd0e82c23d7d5cc93429d6a318e57944dc2a64.tar.gz
Move zuul_log_id injection to command action plugin
The log streaming callback is not being called in the same way in Ansible 2.5 as it was in 2.3. In particular, in some cases different Task objects are used for different hosts. This, combined with the fact that the callback is only called once for a given task means that in these cases we are unable to supply the zuul_log_id to the Task object for the second host on a task. This can be resolved by injecting the zuul_log_id within the command action plugin based on the task uuid directly. Change-Id: I7ff35263c52d93aeabe915532230964994c30850
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/zuul-stream/templates/ansible.cfg.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/zuul-stream/templates/ansible.cfg.j2 b/playbooks/zuul-stream/templates/ansible.cfg.j2
index 41ffc0cea..e90a635f2 100644
--- a/playbooks/zuul-stream/templates/ansible.cfg.j2
+++ b/playbooks/zuul-stream/templates/ansible.cfg.j2
@@ -3,7 +3,7 @@ inventory = {{ ansible_user_dir }}/inventory.yaml
gathering = smart
gather_subset = !all
lookup_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/lookup
-action_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/action
+action_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/action-general:{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/action
callback_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/callback:{{ ansible_user_dir }}/src/git.openstack.org/openstack/ara/ara/plugins/callbacks
module_utils = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/module_utils
stdout_callback = zuul_stream