diff --git a/ara/callback/__init__.py b/ara/plugins/__init__.py similarity index 100% rename from ara/callback/__init__.py rename to ara/plugins/__init__.py diff --git a/ara/plugins/callbacks/__init__.py b/ara/plugins/callbacks/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ara/callback/log_ara.py b/ara/plugins/callbacks/log_ara.py similarity index 100% rename from ara/callback/log_ara.py rename to ara/plugins/callbacks/log_ara.py diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 945e4cb9..80dc4cf8 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -11,9 +11,9 @@ Set up your `ansible.cfg`_ file to seek that callback in the appropriate directory. Here's an example that covers most common locations:: [defaults] - callback_plugins = /usr/lib/python2.7/site-packages/ara/callback:$VIRTUAL_ENV/lib/python2.7/site-packages/ara/callback:/usr/local/lib/python2.7/dist-packages/ara/callback + callback_plugins = /usr/lib/python2.7/site-packages/ara/plugins/callbacks:$VIRTUAL_ENV/lib/python2.7/site-packages/ara/plugins/callbacks:/usr/local/lib/python2.7/dist-packages/ara/plugins/callbacks -.. _callback: https://github.com/dmsimard/ara/blob/master/ara/callback/log_ara.py +.. _callback: https://github.com/dmsimard/ara/blob/master/ara/plugins/callbacks/log_ara.py .. _ansible.cfg: http://docs.ansible.com/ansible/intro_configuration.html#configuration-file *That's it!* diff --git a/run_tests.sh b/run_tests.sh index e7da9acb..cc1a9224 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -17,7 +17,7 @@ tox -e venv --notest source .tox/venv/bin/activate # Setup ARA -export ANSIBLE_CALLBACK_PLUGINS="ara/callback" +export ANSIBLE_CALLBACK_PLUGINS="ara/plugins/callbacks" export ARA_DATABASE="sqlite:///${DATABASE}" # Run test playbooks diff --git a/tests/unit/test_callback.py b/tests/unit/test_callback.py index 46368ee0..71f5c261 100644 --- a/tests/unit/test_callback.py +++ b/tests/unit/test_callback.py @@ -5,7 +5,7 @@ import random import ara.webapp as w import ara.models as m import ara.utils as u -import ara.callback.log_ara as l +import ara.plugins.callbacks.log_ara as l from mock import Mock