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

@@ -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

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