mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 02:54:26 +00:00
834 commits from the Tor onion-service branch against 299 of ours, from merge base7b646bdece: 127 conflicted files, 3506 files changed. The two sides are largely orthogonal. Theirs adds svc-net-tor and a `tor` service across the role tree, plus two sweeping refactors: shipped scripts sorted by language (files/ruby/, files/python/, files/shell/, scripts/lint/*.sh) and the unit suite moved under tests/unit/python/. Ours is requirement 036, the native AI gateway, plus the MCP role work. Most conflicts were both sides appending to the same service map, resolved as unions. Resolutions that were not unions: Credentials moved namespace. Theirs renamed meta/schema.yml to meta/secrets.yml and re-addressed credentials as secrets.credentials.<name>. Git carried our litellm_api_key blocks through the rename, but every consumer we added still read 'credentials.<name>', which no longer resolves. All 45 call sites are migrated. plugins/filter/container_volumes.py is deleted by theirs and relocated to plugins/lookup/container_volumes.py, where it carries the same tmpfs defect ourf85996b43had just fixed: a hard-coded {"size": ...} that silently drops a per mount `mode`. The fix is re-applied in the relocated file, as that commit's merge note anticipated. compose.yml keeps only INFINITO_PLAYWRIGHT_REPORTS_BASE_DIR. Theirs also forwards INFINITO_PLAYWRIGHT_STAGE_BASE_DIR; that line is deliberately dropped, per the analysis recorded in45804e9ad-- STAGE has a drift-proof role-vars fallback, while forwarding it promotes a setdefault-pinnable .env value above that SPOT. tasks/stages/01_constructor.yml takes their include, ./tasks/utils/setup/group.yml, because their refactor removed tasks/groups/*-roles.yml, leaving our include target nonexistent. Our task name is kept, since svc-virt is in the loop. Makefile swarm-zombie is a union: their validate plus teardown, then our lab_subnet cleanup, which their side dropped while leaving lab_subnet.sh as the only orphaned reference in the file. 01_bootstrap.sh keeps our deterministic --ip pinning, which distinguishes an already-attached node from a real failure, over their `|| true`. Their language-sorted layout orphaned references our side still held: zammad's two scripts/apply/*.rb, jenkins' java-with-ca-trust.sh, and the notify topics their handlers renamed to hyphenated form. All corrected. roles/sys-svc-compose/files/shell/swarm/stack_ready.sh gains our latched-update block: paused, rollback_paused, rollback_started and rollback_completed exit 2 rather than polling a state that cannot resolve without another deploy. config_from_run is unioned to (title, logged, jobs); the production caller in trigger/__main__.py now passes jobs, without which our suite suppression would have been inert. READMEs are regenerated rather than hand-merged: 15 LiteLLM rows and 91 Tor rows now derive from the merged metadata, which is itself evidence the meta merge is coherent. Verified: 5161 unit tests pass. The single failure, test_query.py TestSortSpec, also fails on fork/feature/svc-net-tor atb51d2f9919, measured in a baseline worktree -- so this merge introduces no new unit-test failure. Two modules are excluded from that run because `baudolo`, a dependency their branch introduces, is not installed on this host. Not verified: no deploy has run against the merged tree, and make quality has not been run end to end here. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
358 lines
12 KiB
Python
358 lines
12 KiB
Python
from __future__ import annotations
|
|
|
|
import argparse
|
|
import json
|
|
import os
|
|
import sys
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
from .credentials_generator import generate_credentials_for_roles
|
|
from .filters import filter_dynamic_inventory, parse_roles_list
|
|
from .host_vars import (
|
|
apply_vars_overrides,
|
|
apply_vars_overrides_from_file,
|
|
ensure_become_password,
|
|
ensure_host_vars_file,
|
|
)
|
|
from .inventory_generator import generate_dynamic_inventory
|
|
from .mirror_overrides import apply_mirror_overrides
|
|
from .passwords import generate_random_password
|
|
from .project import build_env_with_project_root, detect_project_root
|
|
from .services_disabler import apply_services_disabled_from_env
|
|
from .tor_node import apply_tor_node_onion
|
|
from .users_generator import generate_user_passwords
|
|
from .yaml_io import dump_yaml, load_yaml
|
|
|
|
|
|
def _fatal(msg: str) -> None:
|
|
raise SystemExit(f"[FATAL] {msg}")
|
|
|
|
|
|
def _resolve_inventory_file(
|
|
inventory_dir: Path, inventory_file_arg: str | None
|
|
) -> Path:
|
|
if inventory_file_arg:
|
|
return Path(inventory_file_arg).resolve()
|
|
return (inventory_dir / "devices.yml").resolve()
|
|
|
|
|
|
def _resolve_mirrors_file(project_root: Path, mirror_arg: str | None) -> Path | None:
|
|
"""
|
|
--mirror can be used in two ways:
|
|
- --mirror -> uses <repo-root>/mirrors.yml
|
|
- --mirror /path/file -> uses the given path
|
|
|
|
If mirror_arg is None, mirroring is disabled.
|
|
"""
|
|
if mirror_arg is None:
|
|
return None
|
|
|
|
candidate = Path(mirror_arg)
|
|
if not candidate.is_absolute():
|
|
candidate = (project_root / candidate).resolve()
|
|
|
|
return candidate.resolve()
|
|
|
|
|
|
def main(argv: list[str] | None = None) -> int:
|
|
parser = argparse.ArgumentParser(
|
|
description=(
|
|
"Create or update a full inventory for a host and generate credentials "
|
|
"for all selected applications."
|
|
)
|
|
)
|
|
parser.add_argument(
|
|
"inventory_dir", help="Inventory directory (e.g. inventories/galaxyserver)."
|
|
)
|
|
parser.add_argument(
|
|
"--host",
|
|
default="localhost",
|
|
help="Hostname to use in the inventory (default: localhost).",
|
|
)
|
|
parser.add_argument(
|
|
"--become-password", default=None, help="Optional become password (vaulted)."
|
|
)
|
|
parser.add_argument(
|
|
"--vars",
|
|
required=False,
|
|
help=(
|
|
"Optional JSON object string with additional values for host_vars/<host>.yml. "
|
|
"Merged and overwrites existing values."
|
|
),
|
|
)
|
|
parser.add_argument(
|
|
"--inventory-file",
|
|
default=None,
|
|
help="Inventory YAML file path (default: <inventory-dir>/devices.yml).",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--roles",
|
|
nargs="+",
|
|
help="Legacy include list (used only if neither --include nor --exclude is set).",
|
|
)
|
|
parser.add_argument(
|
|
"--include",
|
|
nargs="+",
|
|
help="Only include these application_ids (mutually exclusive with --exclude).",
|
|
)
|
|
parser.add_argument(
|
|
"--exclude",
|
|
nargs="+",
|
|
help="Exclude these application_ids (mutually exclusive with --include).",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--vault-password-file",
|
|
default=None,
|
|
help="Vault password file path. Default: <inventory-dir>/.password",
|
|
)
|
|
parser.add_argument(
|
|
"--workers",
|
|
type=int,
|
|
default=os.cpu_count() or 4,
|
|
help="Worker threads for credentials generation (default: host CPU count, fallback 4).",
|
|
)
|
|
parser.add_argument(
|
|
"--vars-file",
|
|
default=None,
|
|
help=(
|
|
"Optional YAML file with additional values for host_vars/<host>.yml. "
|
|
"Merged and overwrites existing values."
|
|
),
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--mirror",
|
|
nargs="?",
|
|
const="mirrors.yml",
|
|
default=None,
|
|
help=(
|
|
"Apply docker image mirror overrides to host_vars "
|
|
"applications.*.services.* (image/version). "
|
|
"If used without value, defaults to <repo-root>/mirrors.yml. "
|
|
"If a value is provided, it is treated as a path to the mirrors YAML/JSON file."
|
|
),
|
|
)
|
|
parser.add_argument(
|
|
"--app-variants",
|
|
default=None,
|
|
help=(
|
|
"JSON object {app_id: variant_index} mapping the matrix variant "
|
|
"active in this round for each app. Forwarded to credential "
|
|
"generation so shared-provider discovery (services.<k>.enabled+shared) "
|
|
"respects the variant overlay. Apps not listed default to 0."
|
|
),
|
|
)
|
|
|
|
args = parser.parse_args(argv)
|
|
|
|
include_filter = parse_roles_list(args.include)
|
|
exclude_filter = parse_roles_list(args.exclude)
|
|
legacy_roles_filter = parse_roles_list(args.roles)
|
|
|
|
if include_filter and exclude_filter:
|
|
_fatal(
|
|
"Options --include and --exclude are mutually exclusive. Use only one of them."
|
|
)
|
|
|
|
project_root = detect_project_root(Path(__file__).resolve())
|
|
env = build_env_with_project_root(project_root)
|
|
|
|
roles_dir = (project_root / "roles").resolve()
|
|
mirrors_file = _resolve_mirrors_file(project_root, args.mirror)
|
|
|
|
inventory_dir = Path(args.inventory_dir).resolve()
|
|
inventory_dir.mkdir(parents=True, exist_ok=True)
|
|
|
|
inventory_file = _resolve_inventory_file(inventory_dir, args.inventory_file)
|
|
host_vars_file = (inventory_dir / "host_vars" / f"{args.host}.yml").resolve()
|
|
|
|
if args.vault_password_file:
|
|
vault_password_file = Path(args.vault_password_file).resolve()
|
|
else:
|
|
vault_password_file = (inventory_dir / ".password").resolve()
|
|
if not vault_password_file.exists():
|
|
print(
|
|
f"[INFO] No --vault-password-file provided. Creating {vault_password_file} ..."
|
|
)
|
|
vault_password_file.parent.mkdir(parents=True, exist_ok=True)
|
|
password = generate_random_password()
|
|
fd = os.open(
|
|
str(vault_password_file), os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o600
|
|
)
|
|
with os.fdopen(fd, "w", encoding="utf-8") as f:
|
|
f.write(password + "\n")
|
|
try:
|
|
vault_password_file.chmod(0o600)
|
|
except PermissionError:
|
|
print(
|
|
f"[WARN] Could not set permissions to 0o600 on {vault_password_file}.",
|
|
file=sys.stderr,
|
|
)
|
|
else:
|
|
print(f"[INFO] Using existing vault password file: {vault_password_file}")
|
|
|
|
tmp_inventory = (inventory_dir / "_inventory_full_tmp.yml").resolve()
|
|
|
|
print(
|
|
"[INFO] Generating dynamic inventory via python -m cli.administration.inventory.devices ..."
|
|
)
|
|
dyn_inv = generate_dynamic_inventory(
|
|
host=args.host,
|
|
tmp_inventory=tmp_inventory,
|
|
env=env,
|
|
)
|
|
|
|
dyn_inv = filter_dynamic_inventory(
|
|
dyn_inv,
|
|
include_filter=include_filter,
|
|
exclude_filter=exclude_filter,
|
|
legacy_roles_filter=legacy_roles_filter,
|
|
)
|
|
|
|
dyn_children = (dyn_inv.get("all", {}) or {}).get("children", {}) or {}
|
|
application_ids = sorted(dyn_children.keys())
|
|
|
|
if inventory_file.exists():
|
|
print(f"[INFO] Merging into existing inventory: {inventory_file}")
|
|
base_inv = load_yaml(inventory_file)
|
|
else:
|
|
print(f"[INFO] Creating new inventory file: {inventory_file}")
|
|
base_inv = {}
|
|
|
|
merged_inv = _merge_inventories(base_inv, dyn_inv, host=args.host)
|
|
dump_yaml(inventory_file, merged_inv)
|
|
|
|
print(f"[INFO] Ensuring host_vars for host '{args.host}' at {host_vars_file}")
|
|
ensure_host_vars_file(
|
|
host_vars_file=host_vars_file,
|
|
host=args.host,
|
|
)
|
|
|
|
print(f"[INFO] Ensuring ansible_become_password for host '{args.host}'")
|
|
ensure_become_password(
|
|
host_vars_file=host_vars_file,
|
|
vault_password_file=vault_password_file,
|
|
become_password=args.become_password,
|
|
)
|
|
|
|
print(
|
|
f"[INFO] Pinning a password for every user the {len(application_ids)} "
|
|
"resolved applications declare..."
|
|
)
|
|
pinned = generate_user_passwords(
|
|
roles_dir=roles_dir,
|
|
application_ids=application_ids,
|
|
host_vars_file=host_vars_file,
|
|
vault_password_file=vault_password_file,
|
|
)
|
|
print(f"[INFO] Pinned {pinned} user password(s)")
|
|
|
|
app_variants: dict[str, int] = {}
|
|
if args.app_variants:
|
|
try:
|
|
parsed = json.loads(args.app_variants)
|
|
except Exception as exc:
|
|
_fatal(f"--app-variants must be valid JSON: {exc}")
|
|
if not isinstance(parsed, dict):
|
|
_fatal("--app-variants must be a JSON object")
|
|
for app_id, raw_index in parsed.items():
|
|
try:
|
|
app_variants[str(app_id)] = int(raw_index)
|
|
except (TypeError, ValueError) as exc:
|
|
_fatal(
|
|
f"--app-variants[{app_id!r}] must be an integer, got {raw_index!r}: {exc}"
|
|
)
|
|
|
|
if application_ids:
|
|
print(
|
|
f"[INFO] Generating credentials for {len(application_ids)} applications..."
|
|
)
|
|
generate_credentials_for_roles(
|
|
application_ids=application_ids,
|
|
roles_dir=roles_dir,
|
|
host_vars_file=host_vars_file,
|
|
vault_password_file=vault_password_file,
|
|
project_root=project_root,
|
|
env=env,
|
|
workers=args.workers,
|
|
app_variants=app_variants,
|
|
)
|
|
else:
|
|
print(
|
|
"[WARN] No application_ids found after filtering. Skipping credentials generation."
|
|
)
|
|
|
|
if args.vars_file:
|
|
print(
|
|
f"[INFO] Applying YAML overrides to host_vars for host '{args.host}' via --vars-file"
|
|
)
|
|
apply_vars_overrides_from_file(
|
|
host_vars_file=host_vars_file, vars_file=Path(args.vars_file).resolve()
|
|
)
|
|
|
|
if args.vars:
|
|
print(
|
|
f"[INFO] Applying JSON overrides to host_vars for host '{args.host}' via --vars"
|
|
)
|
|
apply_vars_overrides(host_vars_file=host_vars_file, json_str=args.vars)
|
|
|
|
if mirrors_file is not None:
|
|
print(f"[INFO] Applying mirror overrides from: {mirrors_file}")
|
|
apply_mirror_overrides(host_vars_file=host_vars_file, mirrors_file=mirrors_file)
|
|
|
|
apply_tor_node_onion(
|
|
host_vars_file=host_vars_file,
|
|
application_ids=application_ids,
|
|
base_dir=project_root,
|
|
)
|
|
|
|
apply_services_disabled_from_env(
|
|
host_vars_file=host_vars_file,
|
|
inventory_file=inventory_file,
|
|
roles_dir=roles_dir,
|
|
)
|
|
|
|
print(
|
|
"[INFO] Done. Inventory and host_vars updated without deleting existing values."
|
|
)
|
|
return 0
|
|
|
|
|
|
def _merge_inventories(
|
|
base: dict[str, Any], new: dict[str, Any], host: str
|
|
) -> dict[str, Any]:
|
|
"""
|
|
Merge `new` inventory into `base` inventory without deleting existing groups/hosts/vars.
|
|
|
|
For each group in `new`:
|
|
- ensure the group exists in `base`
|
|
- ensure `hosts` exists
|
|
- ensure the given `host` is present in that group's `hosts`
|
|
"""
|
|
base_all = base.setdefault("all", {})
|
|
base_children = base_all.setdefault("children", {})
|
|
|
|
new_all = new.get("all", {})
|
|
new_children = (
|
|
(new_all.get("children", {}) or {}) if isinstance(new_all, dict) else {}
|
|
)
|
|
|
|
for group_name, group_data in new_children.items():
|
|
base_group = base_children.setdefault(group_name, {})
|
|
base_hosts = base_group.setdefault("hosts", {})
|
|
|
|
new_hosts = (group_data or {}).get("hosts", {}) or {}
|
|
host_vars: dict[str, Any] = {}
|
|
if isinstance(new_hosts, dict) and host in new_hosts:
|
|
hv = new_hosts.get(host) or {}
|
|
if isinstance(hv, dict):
|
|
host_vars = hv
|
|
|
|
if host not in base_hosts:
|
|
base_hosts[host] = host_vars or {}
|
|
|
|
return base
|