fix(deploy): make check/deploy actually run
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=<name>` 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) <noreply@anthropic.com>
This commit is contained in:
parent
f3f382ae69
commit
a2bb99928c
2 changed files with 6 additions and 5 deletions
6
Makefile
6
Makefile
|
|
@ -5,7 +5,7 @@ VENV := .venv
|
||||||
PYTHON := $(VENV)/bin/python
|
PYTHON := $(VENV)/bin/python
|
||||||
PIP := $(VENV)/bin/pip
|
PIP := $(VENV)/bin/pip
|
||||||
ANSIBLE := $(VENV)/bin/ansible
|
ANSIBLE := $(VENV)/bin/ansible
|
||||||
PLAYBOOK := $(VENV)/bin/ansible-playbook
|
PLAYBOOK_BIN := $(VENV)/bin/ansible-playbook
|
||||||
GALAXY := $(VENV)/bin/ansible-galaxy
|
GALAXY := $(VENV)/bin/ansible-galaxy
|
||||||
LINT := $(VENV)/bin/ansible-lint
|
LINT := $(VENV)/bin/ansible-lint
|
||||||
MOLECULE := $(VENV)/bin/molecule
|
MOLECULE := $(VENV)/bin/molecule
|
||||||
|
|
@ -89,13 +89,13 @@ check:
|
||||||
ifndef PLAYBOOK
|
ifndef PLAYBOOK
|
||||||
$(error PLAYBOOK is required: make check PLAYBOOK=<name>)
|
$(error PLAYBOOK is required: make check PLAYBOOK=<name>)
|
||||||
endif
|
endif
|
||||||
$(PLAYBOOK) $(INVENTORY) $(VAULT_ARGS) --check --diff playbooks/$(PLAYBOOK).yml
|
$(PLAYBOOK_BIN) $(INVENTORY) $(VAULT_ARGS) --check --diff playbooks/$(PLAYBOOK).yml
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
ifndef PLAYBOOK
|
ifndef PLAYBOOK
|
||||||
$(error PLAYBOOK is required: make deploy PLAYBOOK=<name>)
|
$(error PLAYBOOK is required: make deploy PLAYBOOK=<name>)
|
||||||
endif
|
endif
|
||||||
$(PLAYBOOK) $(INVENTORY) $(VAULT_ARGS) playbooks/$(PLAYBOOK).yml
|
$(PLAYBOOK_BIN) $(INVENTORY) $(VAULT_ARGS) playbooks/$(PLAYBOOK).yml
|
||||||
|
|
||||||
# ── Vault ─────────────────────────────────────────────────────────────────────
|
# ── Vault ─────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,9 @@ roles_path = roles
|
||||||
collections_path = .collections
|
collections_path = .collections
|
||||||
vault_password_file = scripts/vault-pass-client.sh
|
vault_password_file = scripts/vault-pass-client.sh
|
||||||
interpreter_python = auto_silent
|
interpreter_python = auto_silent
|
||||||
stdout_callback = yaml
|
stdout_callback = default
|
||||||
callbacks_enabled = timer, profile_tasks
|
callback_result_format = yaml
|
||||||
|
callbacks_enabled = ansible.posix.profile_tasks
|
||||||
|
|
||||||
# Avoid slow DNS lookups
|
# Avoid slow DNS lookups
|
||||||
[ssh_connection]
|
[ssh_connection]
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue