From bd1fe7d044560103f3d35e4ae082d883ea6a1875 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Wed, 31 Jan 2024 10:26:07 -0600 Subject: [PATCH 1/3] Revert "use YAML output from ansible as it makes reading errors easier" This reverts commit 669ae69581b108c8374eb419ab4e90b8e50dd5cf. --- ansible/playbooks/ansible.cfg | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ansible/playbooks/ansible.cfg b/ansible/playbooks/ansible.cfg index b0fb054e..a113a780 100644 --- a/ansible/playbooks/ansible.cfg +++ b/ansible/playbooks/ansible.cfg @@ -9,10 +9,7 @@ gathering = smart fact_caching = jsonfile fact_caching_connection = /tmp fact_caching_timeout = 86400 -# Use the YAML callback plugin because it's easier to read the errors -stdout_callback = YAML -# Use the stdout_callback when running ad-hoc commands. -bin_ansible_callbacks = True +stdout_callback = default display_skipped_hosts = no callbacks_enabled = profile_tasks deprecation_warnings = False From 4b677722dad09eb0b17b5fa80af263495b77fa47 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Wed, 31 Jan 2024 10:26:07 -0600 Subject: [PATCH 2/3] Revert "don't use the global collections by default" This reverts commit 8408ae4bfaa4adecf1a26a97053258e6ded1c70c. --- .gitignore | 1 - ansible/playbooks/ansible.cfg | 2 -- 2 files changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index f292df97..47e4ec23 100644 --- a/.gitignore +++ b/.gitignore @@ -120,6 +120,5 @@ tmp.md # Ansible collection files kubernetes_sigs-kubespray*tar.gz ansible_collections -ansible/playbooks/collections kustomize/**/all.yaml diff --git a/ansible/playbooks/ansible.cfg b/ansible/playbooks/ansible.cfg index a113a780..8f63e44c 100644 --- a/ansible/playbooks/ansible.cfg +++ b/ansible/playbooks/ansible.cfg @@ -15,8 +15,6 @@ callbacks_enabled = profile_tasks deprecation_warnings = False inventory_ignore_extensions = ~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo, .creds, .gpg, .example enable_plugins = host_list, script, auto, yaml, ini, toml -# install and use local collections instead of global -collections_paths = ./collections/ansible_collections [inventory] ignore_patterns = artifacts, credentials From b1c3886521064e1bfa7573f60778bc1bb19b0221 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Wed, 31 Jan 2024 10:26:07 -0600 Subject: [PATCH 3/3] Revert "gitignore another common python venv name" This reverts commit 9660fcf79f379312e7aee67e108eae197720dc1a. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 47e4ec23..07aa5c34 100644 --- a/.gitignore +++ b/.gitignore @@ -104,7 +104,6 @@ target/ # virtualenv venv/ -.venv/ ENV/ # molecule