diff --git a/Makefile b/Makefile index 1b4bca3..27b6b86 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ VENV := .venv PYTHON := $(VENV)/bin/python PIP := $(VENV)/bin/pip ANSIBLE := $(VENV)/bin/ansible -PLAYBOOK := $(VENV)/bin/ansible-playbook +PLAYBOOK_BIN := $(VENV)/bin/ansible-playbook GALAXY := $(VENV)/bin/ansible-galaxy LINT := $(VENV)/bin/ansible-lint MOLECULE := $(VENV)/bin/molecule @@ -89,13 +89,13 @@ check: ifndef PLAYBOOK $(error PLAYBOOK is required: make check PLAYBOOK=) endif - $(PLAYBOOK) $(INVENTORY) $(VAULT_ARGS) --check --diff playbooks/$(PLAYBOOK).yml + $(PLAYBOOK_BIN) $(INVENTORY) $(VAULT_ARGS) --check --diff playbooks/$(PLAYBOOK).yml deploy: ifndef PLAYBOOK $(error PLAYBOOK is required: make deploy PLAYBOOK=) endif - $(PLAYBOOK) $(INVENTORY) $(VAULT_ARGS) playbooks/$(PLAYBOOK).yml + $(PLAYBOOK_BIN) $(INVENTORY) $(VAULT_ARGS) playbooks/$(PLAYBOOK).yml # ── Vault ───────────────────────────────────────────────────────────────────── diff --git a/ansible.cfg b/ansible.cfg index 1fc913b..157bc0c 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -4,8 +4,9 @@ roles_path = roles collections_path = .collections vault_password_file = scripts/vault-pass-client.sh interpreter_python = auto_silent -stdout_callback = yaml -callbacks_enabled = timer, profile_tasks +stdout_callback = default +callback_result_format = yaml +callbacks_enabled = ansible.posix.profile_tasks # Avoid slow DNS lookups [ssh_connection]