From 4d853a5d3ccf4c297f7f8a3906eccad199a46cc7 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 11 Aug 2015 19:18:10 -0400 Subject: [PATCH] implemented for v2, missing --tree option for adhoc --- lib/ansible/cli/adhoc.py | 5 ++- lib/ansible/constants.py | 1 + lib/ansible/plugins/callback/tree.py | 64 ++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 lib/ansible/plugins/callback/tree.py diff --git a/lib/ansible/cli/adhoc.py b/lib/ansible/cli/adhoc.py index a92869fafe7..20e160274f7 100644 --- a/lib/ansible/cli/adhoc.py +++ b/lib/ansible/cli/adhoc.py @@ -139,6 +139,10 @@ class AdHocCLI(CLI): else: cb = 'minimal' + if self.options.tree: + C.DEFAULT_CALLBACK_WHITELIST.append('tree') + C.TREE_DIR = self.options.tree + # now create a task queue manager to execute the play self._tqm = None try: @@ -168,4 +172,3 @@ class AdHocCLI(CLI): poller.wait(self.options.seconds, self.options.poll_interval) return poller.results - diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 376952821e8..f43869d2cda 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -241,3 +241,4 @@ DEFAULT_SU_PASS = None VAULT_VERSION_MIN = 1.0 VAULT_VERSION_MAX = 1.0 MAX_FILE_SIZE_FOR_DIFF = 1*1024*1024 +TREE_DIR = None diff --git a/lib/ansible/plugins/callback/tree.py b/lib/ansible/plugins/callback/tree.py new file mode 100644 index 00000000000..afeaa93f87a --- /dev/null +++ b/lib/ansible/plugins/callback/tree.py @@ -0,0 +1,64 @@ +# (c) 2012-2014, Ansible, Inc +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + +import os + +from ansible.plugins.callback import CallbackBase +from ansible.utils.path import makedirs_safe +from ansible.constants import TREE_DIR + + +class CallbackModule(CallbackBase): + ''' + This callback puts results into a host specific file in a directory in json format. + ''' + + CALLBACK_VERSION = 2.0 + CALLBACK_TYPE = 'aggregate' + CALLBACK_NAME = 'tree' + + def write_tree_file(self, tree, hostname, buf): + ''' write something into treedir/hostname ''' + + makedirs_safe(tree) + try: + path = os.path.join(tree, hostname) + fd = open(path, "a+") + fd.write(buf) + fd.close() + except (OSError, IOError) as e: + self._display.warnings("Unable to write to %s's file: %s" % (hostname, str(e))) + + def result_to_tree(self, result): + tree = TREE_DIR + if tree: + self.write_tree_file(tree, result._host.get_name(), self._dump_results(result._result)) + else: + self._display.warnings("Invalid directory provided to tree option: %s" % tree) + + def v2_runner_on_ok(self, result): + self.result_to_tree(result) + + def v2_runner_on_failed(self, result): + self.result_to_tree(result) + + def v2_runner_on_unreachable(self, result): + self.result_to_tree(result) +