From 60d4b75f519c03fca91384f231b071793f582376 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Tue, 13 Mar 2018 11:30:09 +0000 Subject: [PATCH] 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. --- action_plugins | 1 - ansible.cfg | 1 + infrastructure-playbooks/ansible.cfg | 1 + {callback_plugins => plugins/callback}/installer_checkpoint.py | 0 tox.ini | 1 + 5 files changed, 3 insertions(+), 1 deletion(-) delete mode 120000 action_plugins rename {callback_plugins => plugins/callback}/installer_checkpoint.py (100%) diff --git a/action_plugins b/action_plugins deleted file mode 120000 index 3ffd6543c..000000000 --- a/action_plugins +++ /dev/null @@ -1 +0,0 @@ -plugins/actions \ No newline at end of file diff --git a/ansible.cfg b/ansible.cfg index 486f1bddc..102e48708 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -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 diff --git a/infrastructure-playbooks/ansible.cfg b/infrastructure-playbooks/ansible.cfg index 72b0794b3..8d42b01c0 100644 --- a/infrastructure-playbooks/ansible.cfg +++ b/infrastructure-playbooks/ansible.cfg @@ -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 diff --git a/callback_plugins/installer_checkpoint.py b/plugins/callback/installer_checkpoint.py similarity index 100% rename from callback_plugins/installer_checkpoint.py rename to plugins/callback/installer_checkpoint.py diff --git a/tox.ini b/tox.ini index 019adcce1..df6a66f31 100644 --- a/tox.ini +++ b/tox.ini @@ -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 -- 2.39.5