From 877fe9398c28f9a55e5317d29fec76ff8af56810 Mon Sep 17 00:00:00 2001 From: pneerincx Date: Wed, 5 Jan 2022 14:55:09 +0100 Subject: [PATCH 1/3] Just cleanup of outdated stuff. --- callback_plugins/homsaplog.py | 70 ----------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 callback_plugins/homsaplog.py diff --git a/callback_plugins/homsaplog.py b/callback_plugins/homsaplog.py deleted file mode 100644 index b54896092..000000000 --- a/callback_plugins/homsaplog.py +++ /dev/null @@ -1,70 +0,0 @@ -''' -callback: homsaplog -type: stdout -short_description: Homo sapiens friendly formatted output. -description: Use this callback to sort though extensive debug output. -''' - -from __future__ import (absolute_import, division, print_function) -from ansible.plugins.callback.default import CallbackModule as CallbackModule_default -from ansible.plugins.callback import CallbackBase -try: - # Ansible 2.3 - from ansible.vars import strip_internal_keys -except ImportError: - try: - # Anisble2.4 - from ansible.vars.manager import strip_internal_keys - except ImportError: - # Ansible 2.5 - from ansible.vars.clean import strip_internal_keys -try: - import simplejson as json -except ImportError: - import json -import sys -if sys.version_info < (3,0,0): - reload(sys).setdefaultencoding('utf-8') - -__metaclass__ = type - -class CallbackModule(CallbackModule_default): # pylint: disable=too-few-public-methods,no-init - ''' - Override for the default callback module. - - Render std err/out outside of the rest of the result which it prints with - indentation. - ''' - CALLBACK_VERSION = 2.0 - CALLBACK_TYPE = 'stdout' - CALLBACK_NAME = 'homsaplog' - - def _dump_results(self, result, indent=4, sort_keys=True, keep_invocation=False): - '''Return the text to output for a result.''' - - if result.get('_ansible_no_log', False): - return json.dumps(dict(censored= - "The output has been hidden due to the fact that 'no_log: true' was specified for this result.")) - - # All result keys starting with _ansible_ are for internal use only, - # so remove them from the result before we output anything. - reformatted_result = strip_internal_keys(result) - - # remove invocation unless specifically wanting it - if not keep_invocation and self._display.verbosity < 3 and 'invocation' in result: - del reformatted_result['invocation'] - - # remove diff information from screen output - if self._display.verbosity < 3 and 'diff' in result: - del reformatted_result['diff'] - - # remove exception from screen output - if 'exception' in reformatted_result: - del reformatted_result['exception'] - - output = json.dumps(reformatted_result, indent=indent, ensure_ascii=False, sort_keys=sort_keys) - output = output.replace('\\r\\n\",', '",') - output = output.replace('\\r\\n', "\n\t") - output = output.replace('\\n\",', '",') - output = output.replace('\\n', "\n\t") - return output From f320694611de8085bc23da538903f59037beb43f Mon Sep 17 00:00:00 2001 From: pneerincx Date: Wed, 5 Jan 2022 15:00:18 +0100 Subject: [PATCH 2/3] Just cleanup of outdated stuff. --- ansible.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index 518f2040e..2aed36f3c 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -5,10 +5,12 @@ stdout_callback = community.general.yaml timeout = 30 # # Do not use a hard-code vault_password_file file here: -# we have multiple .vault_pass.txt.clustername files with specific passwords for each cluster. +# we have multiple .vault_pass.txt.${stack_name} files with specific passwords for each stack. +# The stack_name and stack_prefix variables are defined in +# group_vars/${stack_name}/vars.yml # source the .lor-init file in the root of the repo and then use the lor-config function: # source ./lor-init -# lor-config [name-of-a-cluster] +# lor-config ${stack_prefix} # This wil configure various environment variables including ANSIBLE_VAULT_PASSWORD_FILE. # #vault_password_file = .vault_pass.txt From 8ca4850c4719ed09ea6effb3ad4c97577ec1b9d7 Mon Sep 17 00:00:00 2001 From: pneerincx Date: Wed, 5 Jan 2022 15:21:25 +0100 Subject: [PATCH 3/3] Cleanup. --- single_group_playbooks/callback_plugins | 1 - single_role_playbooks/callback_plugins | 1 - 2 files changed, 2 deletions(-) delete mode 120000 single_group_playbooks/callback_plugins delete mode 120000 single_role_playbooks/callback_plugins diff --git a/single_group_playbooks/callback_plugins b/single_group_playbooks/callback_plugins deleted file mode 120000 index 3de65f901..000000000 --- a/single_group_playbooks/callback_plugins +++ /dev/null @@ -1 +0,0 @@ -../callback_plugins/ \ No newline at end of file diff --git a/single_role_playbooks/callback_plugins b/single_role_playbooks/callback_plugins deleted file mode 120000 index 3de65f901..000000000 --- a/single_role_playbooks/callback_plugins +++ /dev/null @@ -1 +0,0 @@ -../callback_plugins/ \ No newline at end of file