diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d8f418..997400a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Changelog +## 0.1.4 — 2026-09-07 + +- **install.sh: `ziti-edge-tunnel.service` failed to start after enrolment** (`203/EXEC`: the package's + `ExecStartPre` script is not executable by user `ziti` on ziti-edge-tunnel 1.18.x) and, because the + unit was enabled with `--now` under `set -e`, the script aborted BEFORE writing config/ACLs/grant/timer — + a second kit was needed. The run-host drop-in now clears `ExecStartPre=`; a tunneler start failure is a + WARNING until everything else is in place, then a hard error at the end. + ## 0.1.3 — 2026-09-06 - **install.sh: `--version` was clobbered by `/etc/os-release`** (it defines `VERSION`), so the kit tried to download diff --git a/README.md b/README.md index 37e78c8..d32746b 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ you the enrolment JWT, a one-time **bootstrap deploy grant** and the read-only * ```sh T= # read-only GitLab deploy token (read_package_registry); the kit carries it -curl -sSf -H "DEPLOY-TOKEN: $T" https://scm.tikali.ai/api/v4/projects/69/packages/generic/monky-deployd/0.1.3/install.sh \ +curl -sSf -H "DEPLOY-TOKEN: $T" https://scm.tikali.ai/api/v4/projects/69/packages/generic/monky-deployd/0.1.4/install.sh \ | sudo bash -s -- --env env-qa-02 --site cbs --token "$T" --bootstrap-file bootstrap.jwt --enrol-jwt ./monky-host.env-qa-02.jwt -# [--transport sdk|proxy|system] [--version 0.1.3] [--docker-data-root /home/docker-data] [--laptop] [--bao-ca openbao-ca.pem] [--source gitlab|gitea] +# [--transport sdk|proxy|system] [--version 0.1.4] [--docker-data-root /home/docker-data] [--laptop] [--bao-ca openbao-ca.pem] [--source gitlab|gitea] ``` `install.sh` installs `ziti-edge-tunnel` (OpenZiti `jammy` suite) and `docker-compose-plugin` if diff --git a/ansible/roles/monky_deployd/README.md b/ansible/roles/monky_deployd/README.md index 0a4da9b..5530d93 100644 --- a/ansible/roles/monky_deployd/README.md +++ b/ansible/roles/monky_deployd/README.md @@ -16,7 +16,7 @@ template → optional openbao-ca PEM → optional `monky-deployd-proxy.service` | var | note | |---|---| -| `monky_deployd_version` | pinned release, e.g. `0.1.3` | +| `monky_deployd_version` | pinned release, e.g. `0.1.4` | | `monky_deployd_download_token` | **vaulted**: GitLab deploy token, scope `read_package_registry` only (revocable) — the registry is private; seeded in OpenBao at `monky/monky-tenancy/deployd-download` key `token` (path/key are the operator's choice). Empty = no header (only works with the Gitea `base_url`) | | `monky_deployd_env_id` / `_site` / `_transport` | per host (`env-dev-06`, `cbs`, `sdk`) | | `monky_deployd_bootstrap_grant` | tenancy-minted deploy grant (1 h) — `ansible-vault` or a lookup at play time; empty keeps the existing token | diff --git a/ansible/roles/monky_deployd/defaults/main.yml b/ansible/roles/monky_deployd/defaults/main.yml index 96a5f2d..62de746 100644 --- a/ansible/roles/monky_deployd/defaults/main.yml +++ b/ansible/roles/monky_deployd/defaults/main.yml @@ -1,7 +1,7 @@ --- # monky_deployd — install and configure the Monky backend pull agent (MONKY-ADR-0028 §D). # Copy this role into osg1-07 (roles/monky_deployd) and roll to env-dev-06..09 after the pilot. -monky_deployd_version: "0.1.3" +monky_deployd_version: "0.1.4" monky_deployd_deb: "monky-deployd_{{ monky_deployd_version }}_amd64.deb" # PRIMARY download = the GitLab project's generic package registry on scm.tikali.ai. Inside the estate # gitea.cbs.tikali.net is split-horizon to jump1's RED EIP (10.10.0.175, no HTTP ingress), so backend diff --git a/config.example.yaml b/config.example.yaml index 8f22a7f..851b07a 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -1,4 +1,4 @@ -# /etc/monky-deployd/config.yaml — monky-deployd v0.1.3 (MONKY-ADR-0028 §D) +# /etc/monky-deployd/config.yaml — monky-deployd v0.1.4 (MONKY-ADR-0028 §D) # Written by packaging/install.sh (or the ansible role monky_deployd). YAML *subset*: maps, scalars, # simple lists, comments. Keys not listed here are a config error. diff --git a/monky_deployd/__init__.py b/monky_deployd/__init__.py index dbe737a..2e0e37a 100644 --- a/monky_deployd/__init__.py +++ b/monky_deployd/__init__.py @@ -4,4 +4,4 @@ Dials monky-tenancy over the mesh with the box's host identity, fetches the rend leases a deploy grant, logs in to OpenBao, reads its own secrets, runs `docker compose`, reports. Stdlib only; the optional `openziti` SDK is the `sdk` transport.""" -__version__ = "0.1.3" +__version__ = "0.1.4" diff --git a/packaging/install.sh b/packaging/install.sh index 9990e57..bf2bdc4 100755 --- a/packaging/install.sh +++ b/packaging/install.sh @@ -3,9 +3,9 @@ # # T= # from the install kit / OpenBao # curl -sSf -H "DEPLOY-TOKEN: $T" \ -# https://scm.tikali.ai/api/v4/projects/69/packages/generic/monky-deployd/0.1.3/install.sh \ +# https://scm.tikali.ai/api/v4/projects/69/packages/generic/monky-deployd/0.1.4/install.sh \ # | sudo bash -s -- --env env-qa-02 --site cbs --token "$T" --bootstrap-file bootstrap.jwt \ -# [--transport sdk|proxy|system] [--version 0.1.3] [--enrol-jwt /path/monky-host.env-qa-02.jwt] \ +# [--transport sdk|proxy|system] [--version 0.1.4] [--enrol-jwt /path/monky-host.env-qa-02.jwt] \ # [--laptop] [--source gitlab|gitea] [--docker-data-root /home/docker-data] # # --token / MONKY_DEPLOYD_TOKEN: the GitLab project is PRIVATE (its parent groups are private, so it @@ -29,7 +29,7 @@ set -euo pipefail umask 077 -DEFAULT_VERSION="0.1.3" +DEFAULT_VERSION="0.1.4" # Download source. PRIMARY is the GitLab project's generic package registry on scm.tikali.ai: inside # the estate gitea.cbs.tikali.net is split-horizon to jump1's RED EIP (10.10.0.175), which has no HTTP # ingress, so backend boxes cannot reach the Gitea mirror (cbs/iac#102); scm.tikali.ai they can. The @@ -45,7 +45,7 @@ TOKEN="${MONKY_DEPLOYD_TOKEN:-}" OPENZITI_SUITE="${OPENZITI_SUITE:-jammy}" IDENTITY_DIR="/opt/openziti/etc/identities" ETC="/etc/monky-deployd" -ENV_ID="" SITE="" TRANSPORT="sdk" DOCKER_DATA_ROOT="" DEPLOYD_VERSION="$DEFAULT_VERSION" ENROL_JWT="" BOOTSTRAP_FILE="" NO_RUN="" FORCE_CONFIG="" BAO_CA="" LAPTOP="false" +ENV_ID="" SITE="" TRANSPORT="sdk" DOCKER_DATA_ROOT="" TUNNEL_FAILED="" DEPLOYD_VERSION="$DEFAULT_VERSION" ENROL_JWT="" BOOTSTRAP_FILE="" NO_RUN="" FORCE_CONFIG="" BAO_CA="" LAPTOP="false" usage() { if [ -f "$0" ]; then sed -n '2,28p' "$0"; else echo "monky-deployd install.sh — see README.md (Install)"; fi; exit "${1:-0}"; } die() { echo "install.sh: $*" >&2; exit 1; } @@ -194,14 +194,21 @@ chmod 0600 "$IDENTITY" # ziti-edge-tunnel as a HOST (bind side, no tun/DNS) — the agent dials with the SDK or the proxy install -d /etc/systemd/system/ziti-edge-tunnel.service.d cat > /etc/systemd/system/ziti-edge-tunnel.service.d/run-host.conf <<'DROPIN' -# monky-deployd: run-host mode (no tun, no DNS); identities from the standard directory +# monky-deployd: run-host mode (no tun, no DNS); identities from the standard directory. +# ExecStartPre is cleared: the package's ziti-edge-tunnel.sh (auto-enrol *.jwt in the identity dir) +# is not executable by user ziti on 1.18.x (203/EXEC, env-qa-02 pilot) and run-host does not need it. [Service] +ExecStartPre= ExecStart= ExecStart=/opt/openziti/bin/ziti-edge-tunnel run-host --identity-dir=/opt/openziti/etc/identities DROPIN systemctl daemon-reload -systemctl enable --now ziti-edge-tunnel.service -systemctl restart ziti-edge-tunnel.service || true +systemctl enable ziti-edge-tunnel.service >/dev/null 2>&1 || true +if ! systemctl restart ziti-edge-tunnel.service; then + # do NOT abort here: config, ACLs, grant and timer below must land so a re-run needs no new kit + echo "WARNING: ziti-edge-tunnel.service failed to start — see: journalctl -u ziti-edge-tunnel; continuing" >&2 + TUNNEL_FAILED=1 +fi # --- 4. config, ACLs, bootstrap grant ----------------------------------------------------------------- install -d -m 0750 -o root -g monky-deployd "$ETC" @@ -292,3 +299,7 @@ monky-deployd $DEPLOYD_VERSION installed for $ENV_ID ($SITE, transport $TRANSPOR CHECK CHECK_STATUS="$(monky-deployd status 2>&1 || true)" echo "$CHECK_STATUS" | sed 's/^/ | /' +if [ -n "$TUNNEL_FAILED" ] && ! systemctl is-active --quiet ziti-edge-tunnel.service; then + echo "ERROR: ziti-edge-tunnel.service is not running; the agent cannot reach the mesh until it is. Everything else is installed — fix the unit and 'systemctl restart ziti-edge-tunnel monky-deployd'." >&2 + exit 1 +fi diff --git a/pyproject.toml b/pyproject.toml index 7b97620..8309ef7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "monky-deployd" -version = "0.1.3" +version = "0.1.4" description = "Monky backend pull agent: checkin -> bundle -> lease -> OpenBao -> docker compose -> report, over the ziti mesh (MONKY-ADR-0028)" readme = "README.md" requires-python = ">=3.12"