cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'callbackinit' of git://github.com/sergevanginderachter/ansible into devel

Browse source
This commit is contained in:
Michael DeHaan 2013-06-18 20:52:43 -04:00
commit 132c89e681
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/callbacks.py
View file

@ -41,6 +41,10 @@ if constants.DEFAULT_LOG_PATH != '':
user = getpass.getuser() user = getpass.getuser()
logger = logging.getLogger("p=%s u=%s | " % (mypid, user)) logger = logging.getLogger("p=%s u=%s | " % (mypid, user))
callback_plugins = []
def load_callback_plugins():
global callback_plugins
callback_plugins = [x for x in utils.plugins.callback_loader.all()] callback_plugins = [x for x in utils.plugins.callback_loader.all()]
def get_cowsay_info(): def get_cowsay_info():

2
lib/ansible/playbook/__init__.py
View file

@ -129,11 +129,13 @@ class PlayBook(object):
self.inventory = inventory self.inventory = inventory
self.basedir = os.path.dirname(playbook) or '.' self.basedir = os.path.dirname(playbook) or '.'
utils.plugins.push_basedir(self.basedir)
vars = {} vars = {}
if self.inventory.basedir() is not None: if self.inventory.basedir() is not None:
vars['inventory_dir'] = self.inventory.basedir() vars['inventory_dir'] = self.inventory.basedir()
self.filename = playbook self.filename = playbook
(self.playbook, self.play_basedirs) = self._load_playbook_from_file(playbook, vars) (self.playbook, self.play_basedirs) = self._load_playbook_from_file(playbook, vars)
ansible.callbacks.load_callback_plugins()
# ***************************************************** # *****************************************************

1
lib/ansible/utils/plugins.py
View file

@ -28,6 +28,7 @@ PLUGIN_PATH_CACHE = {}
_basedirs = [] _basedirs = []
def push_basedir(basedir): def push_basedir(basedir):
if basedir not in _basedirs:
_basedirs.insert(0, basedir) _basedirs.insert(0, basedir)
class PluginLoader(object): class PluginLoader(object):