From f623adefab38d3603b08643b2eca5d03a2d9e802 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 4 May 2022 14:20:16 -0700 Subject: [PATCH] Cleanup actiongeneral usage A couple of locations continue to reference actiongeneral which has been removed. Update these locations to use action as the current location for these plugins. Change-Id: I71c03d2c0a84592be66fa0d84bc684684a392a27 --- playbooks/zuul-stream/templates/ansible.cfg.j2 | 2 +- tools/test-logs.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/zuul-stream/templates/ansible.cfg.j2 b/playbooks/zuul-stream/templates/ansible.cfg.j2 index c07f3c8ab0..3638d26993 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/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/lookup -action_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/actiongeneral:{{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/action +action_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/action callback_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/callback stdout_callback = zuul_stream library = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/library diff --git a/tools/test-logs.sh b/tools/test-logs.sh index d71b9b7f94..046743aca9 100755 --- a/tools/test-logs.sh +++ b/tools/test-logs.sh @@ -66,12 +66,12 @@ gathering = smart gather_subset = !all fact_caching = jsonfile fact_caching_connection = ~/.cache/facts -lookup_plugins = ${ZUUL_ANSIBLE}/zuul/ansible/lookup -callback_plugins = ${ZUUL_ANSIBLE}/zuul/ansible/callback:$ARA_DIR/plugins/callbacks -action_plugins = ${ZUUL_ANSIBLE}/zuul/ansible/actiongeneral:${ZUUL_ANSIBLE}/zuul/ansible/actiontrusted -module_utils = ${ZUUL_ANSIBLE}/zuul/ansible/module_utils +lookup_plugins = ${ZUUL_ANSIBLE}/zuul/ansible/base/lookup +callback_plugins = ${ZUUL_ANSIBLE}/zuul/ansible/base/callback:$ARA_DIR/plugins/callbacks +action_plugins = ${ZUUL_ANSIBLE}/zuul/ansible/base/action +module_utils = ${ZUUL_ANSIBLE}/zuul/ansible/base/module_utils stdout_callback = zuul_stream -library = ${ZUUL_ANSIBLE}/zuul/ansible/library +library = ${ZUUL_ANSIBLE}/zuul/ansible/base/library retry_files_enabled = False EOF