Merge branch 'basedir-plugins' of git://github.com/dhozac/ansible into devel

This commit is contained in:
Michael DeHaan 2012-10-16 18:00:55 -04:00
commit f3407dec0e
5 changed files with 35 additions and 4 deletions

View file

@ -22,10 +22,15 @@ import os
import subprocess
import os.path
from ansible.color import stringc
import ansible.constants as C
dirname = os.path.dirname(__file__)
callbacks = utils.import_plugins(os.path.join(dirname, 'callback_plugins'))
callbacks = [ c.CallbackModule() for c in callbacks.values() ]
def load_more_callbacks(dirname):
callbacks.extend([c.CallbackModule() for c in utils.import_plugins(dirname).values()])
for i in C.DEFAULT_CALLBACK_PLUGIN_PATH.split(os.pathsep):
load_more_callbacks(i)
cowsay = None
if os.getenv("ANSIBLE_NOCOWS") is not None: