From a2bb99928caca8ba54cf124c56097307968546ed Mon Sep 17 00:00:00 2001 From: sjat Date: Thu, 11 Jun 2026 14:09:12 +0200 Subject: [PATCH] fix(deploy): make check/deploy actually run MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two latent bugs that blocked the documented deploy path (never exercised end-to-end before applying dev_env to ubongo): - Makefile: the PLAYBOOK variable was both the ansible-playbook BINARY path and the user-supplied playbook NAME, so `make check/deploy PLAYBOOK=` overrode the binary. Renamed the binary var to PLAYBOOK_BIN. - ansible.cfg: stdout_callback=yaml and callbacks_enabled=timer were community.general plugins (not installed; boma only ships ansible.posix). Use the built-in default callback with callback_result_format=yaml and ansible.posix.profile_tasks — same intent, no new heavy collection. Co-Authored-By: Claude Opus 4.8 (1M context) --- Makefile | 6 +++--- ansible.cfg | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) 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]