Cleanup plugins directories and references

Having callback_plugins, and action plugins in random locations causes
a lot of disparity.

We should centralize this into one place in the plugins directory and
fix up the ansible.cfg to reflect this.

Additionally, since the ansible.cfg already reflects action_plugins, we
don't need a link to action_plugins in the base of the repository.
pull/2450/head
Andy McCrae 2018-03-13 11:30:09 +00:00 committed by Sébastien Han
parent 691f7c5146
commit 60d4b75f51
5 changed files with 3 additions and 1 deletions

View File

@ -1 +0,0 @@
plugins/actions

View File

@ -4,6 +4,7 @@
[defaults]
ansible_managed = Please do not change this file directly since it is managed by Ansible and will be overwritten
action_plugins = plugins/actions
callback_plugins = plugins/callback
roles_path = ./roles
# Be sure the user running Ansible has permissions on the logfile
log_path = /var/log/ansible.log

View File

@ -1,4 +1,5 @@
[defaults]
ansible_managed = Please do not change this file directly since it is managed by Ansible and will be overwritten
action_plugins = ../plugins/actions
callback_plugins = ../plugins/callback
roles_path = ../roles

View File

@ -124,6 +124,7 @@ setenv=
ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config
ANSIBLE_CONFIG = -F {toxinidir}/ansible.cfg
ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions
ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback
ANSIBLE_CALLBACK_WHITELIST = profile_tasks
# only available for ansible >= 2.2
ANSIBLE_STDOUT_CALLBACK = debug