documentation/changelog/2026-05-27-ansible-branch-consolidation.md

Fleet Operations Change Log

2026-05-27 — Ansible Pull Branch Consolidation

Event

Fleet-wide ansible-pull-deploy repository consolidated from dual-branch (master + main) to single canonical main branch. All nodes updated to pull from main.

Root Cause

• master and main had diverged by 3 commits
• Swarm worker host_vars (mk-33, mk-34, mk-39, mk-42) existed only on main
• Systemd-based G9 nodes (MK33/34/39/42) were pulling master — would fail on next run since master was stale and missing swarm configs
• README still showed decommissioned bones.yml and non-existent roles/common/ structure

Actions Taken

1. Merged master → main (already up-to-date, main was ahead)
2. Deleted master branch locally and on Gitea remote
3. Removed host_vars/bones.yml (Bones decommissioned)
4. Updated README.md with accurate 11-node fleet map
5. Fixed ansible-pull.service and ansible-pull-fixed.service to clone/pull main branch
6. Updated Artemis local repo (/var/lib/ansible/local) to latest main
7. Rolled out service fix to MK33/34/39/42 via SSH
8. Pruned stale origin/master refs from all 4 nodes

Fleet State After Fix

Node	Mechanism	Branch	Status
Artemis	cron	main	✅ synced
MK7	cron	main	✅ already correct
MK33	systemd	main	✅ fixed + pruned
MK34	systemd	main	✅ fixed + pruned
MK39	systemd	main	✅ fixed + pruned
MK42	systemd	main	✅ fixed + pruned
Neo	cron	main	✅ already correct
Cinnamint	cron	main	✅ already correct
Mark5	cron	main	✅ already correct
Shield	cron	main	✅ already correct
MK44	powered off	—	N/A

Commits

• 75de374 — fix: consolidate under main branch, remove bones.yml, update README fleet map, fix service files to pull main

---

Logged by Artemis. Next update: PRD Chunk2 completion.