From fd0dcab30002ba0c84345df26c62288cd7b0ae6c Mon Sep 17 00:00:00 2001 From: karpenok Date: Sun, 15 Nov 2026 22:44:34 +0700 Subject: [PATCH] ci: unify into matrix ansible-deploy.yml, add ansible-lint.yml and exit_nodes group --- .gitea/workflows/ansible-core-mon.yml | 37 -------- .gitea/workflows/ansible-core-net.yml | 39 -------- .gitea/workflows/ansible-core-secrets.yml | 37 -------- .gitea/workflows/ansible-deploy.yml | 85 ++++++++++++++++++ .gitea/workflows/ansible-ger-nod-02.yml | 39 -------- .gitea/workflows/ansible-lint.yml | 33 +++++++ .gitea/workflows/ansible-opnsense.yml | 35 -------- .gitea/workflows/ansible-rus-central.yml | 45 ---------- .../__pycache__/ansible-plan.cpython-314.pyc | Bin 0 -> 4259 bytes ansible/ci/ansible-plan.py | 70 +++++++++++++++ ansible/ci/ansible-target.sh | 53 ++++++----- ansible/ci/deploy-machine.sh | 39 ++++---- ansible/inventories/prod/hosts.yml | 4 + .../roles/core-net/remnawave/files/nodes.yml | 1 + .../remnawave/files/sync_remnawave.py | 1 + .../core-net/remnawave/tasks/bootstrap.yml | 1 + .../roles/core-net/remnawave/tasks/sync.yml | 1 + .../roles/netbird_exit_node/defaults/main.yml | 1 + 18 files changed, 243 insertions(+), 278 deletions(-) delete mode 100644 .gitea/workflows/ansible-core-mon.yml delete mode 100644 .gitea/workflows/ansible-core-net.yml delete mode 100644 .gitea/workflows/ansible-core-secrets.yml create mode 100644 .gitea/workflows/ansible-deploy.yml delete mode 100644 .gitea/workflows/ansible-ger-nod-02.yml create mode 100644 .gitea/workflows/ansible-lint.yml delete mode 100644 .gitea/workflows/ansible-opnsense.yml delete mode 100644 .gitea/workflows/ansible-rus-central.yml create mode 100644 ansible/ci/__pycache__/ansible-plan.cpython-314.pyc create mode 100644 ansible/ci/ansible-plan.py diff --git a/.gitea/workflows/ansible-core-mon.yml b/.gitea/workflows/ansible-core-mon.yml deleted file mode 100644 index 5f91b87..0000000 --- a/.gitea/workflows/ansible-core-mon.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: ansible-core-mon - -on: - push: - branches: - - main - paths: - - 'ansible/roles/core-mon/**' - - 'ansible/roles/host/**' - - 'ansible/playbooks/core-mon.yml' - - 'ansible/playbooks/host.yml' - - 'ansible/inventories/prod/host_vars/core-mon.yml' - - 'ansible/inventories/prod/group_vars/**' - workflow_dispatch: - -jobs: - deploy: - runs-on: homelab - container: - image: homelab-ansible:latest - timeout-minutes: 30 - steps: - - name: Деплой core-mon - env: - INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} - INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} - run: | - set -eu - rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" - sha="${GITHUB_SHA:-${GITEA_SHA:-}}" - if [ -n "${sha}" ]; then - git -C "${HOME}/homelab-infra" checkout "${sha}" - fi - chmod -R go-w "${HOME}/homelab-infra" - exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" core-mon "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" - diff --git a/.gitea/workflows/ansible-core-net.yml b/.gitea/workflows/ansible-core-net.yml deleted file mode 100644 index 16c19c2..0000000 --- a/.gitea/workflows/ansible-core-net.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: ansible-core-net - -on: - push: - branches: - - main - paths: - - 'ansible/roles/core-net/**' - - 'ansible/roles/agent_vault_service/**' - - 'ansible/roles/netbird_client/**' - - 'ansible/roles/vmagent/**' - - 'ansible/roles/host/**' - - 'ansible/playbooks/core-net.yml' - - 'ansible/playbooks/host.yml' - - 'ansible/inventories/prod/host_vars/core-net.yml' - - 'ansible/inventories/prod/group_vars/**' - workflow_dispatch: - -jobs: - deploy: - runs-on: homelab - container: - image: homelab-ansible:latest - timeout-minutes: 45 - steps: - - name: Деплой core-net - env: - INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} - INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} - run: | - set -eu - rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" - sha="${GITHUB_SHA:-${GITEA_SHA:-}}" - if [ -n "${sha}" ]; then - git -C "${HOME}/homelab-infra" checkout "${sha}" - fi - chmod -R go-w "${HOME}/homelab-infra" - exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" core-net "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" diff --git a/.gitea/workflows/ansible-core-secrets.yml b/.gitea/workflows/ansible-core-secrets.yml deleted file mode 100644 index ae1621d..0000000 --- a/.gitea/workflows/ansible-core-secrets.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: ansible-core-secrets - -on: - push: - branches: - - main - paths: - - 'ansible/roles/core-secrets/**' - - 'ansible/roles/cadvisor/**' - - 'ansible/roles/host/**' - - 'ansible/playbooks/core-secrets.yml' - - 'ansible/playbooks/host.yml' - - 'ansible/inventories/prod/host_vars/core-secrets.yml' - - 'ansible/inventories/prod/group_vars/**' - workflow_dispatch: - -jobs: - deploy: - runs-on: homelab - container: - image: homelab-ansible:latest - timeout-minutes: 30 - steps: - - name: Деплой core-secrets - env: - INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} - INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} - run: | - set -eu - rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" - sha="${GITHUB_SHA:-${GITEA_SHA:-}}" - if [ -n "${sha}" ]; then - git -C "${HOME}/homelab-infra" checkout "${sha}" - fi - chmod -R go-w "${HOME}/homelab-infra" - exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" core-secrets "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" diff --git a/.gitea/workflows/ansible-deploy.yml b/.gitea/workflows/ansible-deploy.yml new file mode 100644 index 0000000..e0f8728 --- /dev/null +++ b/.gitea/workflows/ansible-deploy.yml @@ -0,0 +1,85 @@ +name: ansible-deploy + +on: + push: + branches: + - main + paths: + - 'ansible/**' + paths-ignore: + - 'ansible/ci/**' + workflow_dispatch: + inputs: + machine: + description: 'Целевая машина (или all для полного прогона)' + required: true + default: 'all' + type: choice + options: + - all + - core-net + - core-secrets + - core-mon + - rus-central + - ger-nod-02 + - opnsense + tags: + description: 'Необязательный фильтр тегов (например: remnawave, netbird, monitoring)' + required: false + default: '' + type: string + +jobs: + plan: + runs-on: homelab + container: + image: homelab-ansible:latest + outputs: + matrix: ${{ steps.calc.outputs.matrix }} + has_targets: ${{ steps.calc.outputs.has_targets }} + steps: + - name: Вычислить затронутые машины + id: calc + env: + EVENT_NAME: ${{ github.event_name }} + EVENT_BEFORE: ${{ github.event.before }} + EVENT_SHA: ${{ github.sha }} + INPUT_MACHINE: ${{ inputs.machine || 'all' }} + INPUT_TAGS: ${{ inputs.tags || '' }} + run: | + set -eu + rm -rf "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + sha="${GITHUB_SHA:-${GITEA_SHA:-}}" + if [ -n "${sha}" ]; then + git -C "${HOME}/homelab-infra" checkout "${sha}" + fi + python3 "${HOME}/homelab-infra/ansible/ci/ansible-plan.py" + + deploy: + needs: plan + if: needs.plan.outputs.has_targets == 'true' + runs-on: homelab + container: + image: homelab-ansible:latest + timeout-minutes: 45 + strategy: + fail-fast: false + max-parallel: 1 + matrix: ${{ fromJSON(needs.plan.outputs.matrix) }} + steps: + - name: Деплой ${{ matrix.machine }} + env: + INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} + INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} + run: | + set -eu + rm -rf "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + sha="${GITHUB_SHA:-${GITEA_SHA:-}}" + if [ -n "${sha}" ]; then + git -C "${HOME}/homelab-infra" checkout "${sha}" + fi + chmod -R go-w "${HOME}/homelab-infra" + exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" \ + "${{ matrix.machine }}" "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" "${{ matrix.tags }}" diff --git a/.gitea/workflows/ansible-ger-nod-02.yml b/.gitea/workflows/ansible-ger-nod-02.yml deleted file mode 100644 index 9c8dd4e..0000000 --- a/.gitea/workflows/ansible-ger-nod-02.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: ansible-ger-nod-02 - -on: - push: - branches: - - main - paths: - - 'ansible/roles/netbird_exit_node/**' - - 'ansible/roles/remnanode/**' - - 'ansible/roles/netbird_client/**' - - 'ansible/roles/vmagent/**' - - 'ansible/roles/host/**' - - 'ansible/playbooks/ger-nod-02.yml' - - 'ansible/playbooks/host.yml' - - 'ansible/inventories/prod/host_vars/ger-nod-02.yml' - - 'ansible/inventories/prod/group_vars/**' - workflow_dispatch: - -jobs: - deploy: - runs-on: homelab - container: - image: homelab-ansible:latest - timeout-minutes: 45 - steps: - - name: Деплой ger-nod-02 - env: - INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} - INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} - run: | - set -eu - rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" - sha="${GITHUB_SHA:-${GITEA_SHA:-}}" - if [ -n "${sha}" ]; then - git -C "${HOME}/homelab-infra" checkout "${sha}" - fi - chmod -R go-w "${HOME}/homelab-infra" - exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" ger-nod-02 "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" diff --git a/.gitea/workflows/ansible-lint.yml b/.gitea/workflows/ansible-lint.yml new file mode 100644 index 0000000..d51e0c8 --- /dev/null +++ b/.gitea/workflows/ansible-lint.yml @@ -0,0 +1,33 @@ +name: ansible-lint + +on: + push: + branches: + - main + paths: + - 'ansible/**' + +jobs: + lint: + runs-on: homelab + container: + image: homelab-ansible:latest + timeout-minutes: 10 + steps: + - name: Проверка синтаксиса скриптов, Python и плейбуков + run: | + set -eu + rm -rf "${HOME}/homelab-infra" + git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + sha="${GITHUB_SHA:-${GITEA_SHA:-}}" + if [ -n "${sha}" ]; then + git -C "${HOME}/homelab-infra" checkout "${sha}" + fi + cd "${HOME}/homelab-infra" + sh -n ansible/ci/ansible-target.sh + bash -n ansible/ci/deploy-machine.sh + python3 -m py_compile ansible/ci/ansible-plan.py \ + ansible/roles/core-net/remnawave/files/sync_remnawave.py \ + ansible/roles/rus-central/netbird/files/sync_access.py + cd ansible + ansible-playbook --syntax-check playbooks/*.yml diff --git a/.gitea/workflows/ansible-opnsense.yml b/.gitea/workflows/ansible-opnsense.yml deleted file mode 100644 index 1788bb3..0000000 --- a/.gitea/workflows/ansible-opnsense.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: ansible-opnsense - -on: - push: - branches: - - main - paths: - - 'ansible/roles/opnsense/**' - - 'ansible/playbooks/opnsense.yml' - - 'ansible/inventories/prod/host_vars/opnsense.yml' - - 'ansible/inventories/prod/group_vars/**' - workflow_dispatch: - -jobs: - deploy: - runs-on: homelab - container: - image: homelab-ansible:latest - timeout-minutes: 30 - steps: - - name: Деплой opnsense - env: - INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} - INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} - run: | - set -eu - rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" - sha="${GITHUB_SHA:-${GITEA_SHA:-}}" - if [ -n "${sha}" ]; then - git -C "${HOME}/homelab-infra" checkout "${sha}" - fi - chmod -R go-w "${HOME}/homelab-infra" - exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" opnsense "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" - diff --git a/.gitea/workflows/ansible-rus-central.yml b/.gitea/workflows/ansible-rus-central.yml deleted file mode 100644 index 03b0518..0000000 --- a/.gitea/workflows/ansible-rus-central.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: ansible-rus-central - -on: - push: - branches: - - main - paths: - - 'ansible/roles/agent_vault_service/**' - - 'ansible/roles/rus-central/**' - - 'ansible/roles/cadvisor/**' - - 'ansible/roles/host/**' - - 'ansible/playbooks/rus-central.yml' - - 'ansible/playbooks/host.yml' - - 'ansible/inventories/prod/host_vars/rus-central.yml' - - 'ansible/inventories/prod/group_vars/**' - workflow_dispatch: - inputs: - letsencrypt_email: - description: Почта Let's Encrypt, если её нужно задать отдельно от group_vars - required: false - type: string - default: "" - -jobs: - deploy: - runs-on: homelab - container: - image: homelab-ansible:latest - timeout-minutes: 30 - steps: - - name: Деплой rus-central - env: - INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }} - INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }} - INPUT_LETSENCRYPT_EMAIL: ${{ inputs.letsencrypt_email }} - run: | - set -eu - rm -rf "${HOME}/homelab-infra" - git clone http://192.168.1.105:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" - sha="${GITHUB_SHA:-${GITEA_SHA:-}}" - if [ -n "${sha}" ]; then - git -C "${HOME}/homelab-infra" checkout "${sha}" - fi - chmod -R go-w "${HOME}/homelab-infra" - exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" rus-central "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}" diff --git a/ansible/ci/__pycache__/ansible-plan.cpython-314.pyc b/ansible/ci/__pycache__/ansible-plan.cpython-314.pyc new file mode 100644 index 0000000000000000000000000000000000000000..56aa7bfebde7a1136a9771970f29263fa92c564f GIT binary patch literal 4259 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 list[str]: + machines = [] + for p in sorted(playbooks_dir.glob("*.yml")): + name = p.stem + if name not in SKIP_PLAYBOOKS: + machines.append(name) + return machines + + +def main() -> int: + event = os.environ.get("EVENT_NAME", "push").strip() + before = os.environ.get("EVENT_BEFORE", "").strip() + after = os.environ.get("EVENT_SHA", "").strip() + input_machine = os.environ.get("INPUT_MACHINE", "all").strip() + input_tags = os.environ.get("INPUT_TAGS", "").strip() + + root = Path(__file__).resolve().parents[2] + machines = list_machines(root / "ansible" / "playbooks") + include: list[dict[str, str]] = [] + + if event == "workflow_dispatch": + selected = machines if input_machine in ("", "all") else [input_machine] + for m in selected: + if m not in machines: + print(f"Неизвестная или запрещённая для CI машина: {m}", file=sys.stderr) + return 2 + include.append({"machine": m, "tags": input_tags}) + else: + for m in machines: + proc = subprocess.run( + ["sh", str(root / "ansible" / "ci" / "ansible-target.sh"), m, event, before, after], + cwd=root, + capture_output=True, + text=True, + check=False, + ) + if proc.returncode != 0: + print(proc.stderr, file=sys.stderr, end="") + return proc.returncode + if proc.stdout.strip(): + include.append({"machine": m, "tags": ""}) + + matrix_json = json.dumps({"include": include}, separators=(",", ":")) + has_targets = "true" if include else "false" + print(f"Planned targets: {matrix_json}") + + gh_out = os.environ.get("GITHUB_OUTPUT") + if gh_out: + with open(gh_out, "a", encoding="utf-8") as fh: + fh.write(f"matrix={matrix_json}\n") + fh.write(f"has_targets={has_targets}\n") + return 0 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/ansible/ci/ansible-target.sh b/ansible/ci/ansible-target.sh index ebeab82..4fd9463 100755 --- a/ansible/ci/ansible-target.sh +++ b/ansible/ci/ansible-target.sh @@ -1,9 +1,8 @@ #!/bin/sh # Печатает аргументы ansible-playbook для одной машины. -# Полный прогон только для общих файлов: playbooks/site.yml, --limit, <машина> -# Файл роли: playbooks/<машина>.yml, --tags, каталог роли -# Тег берётся из каталога ansible/roles/<машина>/<продукт>/ и должен совпадать с тегом в плейбуке машины. -# Файл в roles/<машина>/ вне такого каталога завершает скрипт с кодом 2. +# Полный прогон только при ручном запуске без тегов или при изменении общих файлов машины: +# playbooks/site.yml --limit <машина> +# Файл роли: playbooks/<машина>.yml --tags <продукт> # Коммит без файлов этой машины ничего не печатает и завершается с кодом 0. set -eu @@ -11,14 +10,18 @@ machine=${1:?machine} event=${2:-} before=${3:-} after=${4:-} +override_tags=${5:-} -case "$machine" in - core-net | core-secrets | core-mon | core-git | rus-central | ger-nod-02 | opnsense) ;; - *) - echo "Неизвестная машина: $machine" >&2 - exit 2 - ;; -esac +playbook="ansible/playbooks/${machine}.yml" +if [ "$machine" = "site" ] || [ "$machine" = "host" ] || [ ! -f "$playbook" ]; then + echo "Неизвестная машина: $machine" >&2 + exit 2 +fi + +if [ -n "$override_tags" ]; then + printf '%s\n' "playbooks/${machine}.yml" "--tags" "$override_tags" + exit 0 +fi full=0 changed="" @@ -39,7 +42,6 @@ fi tags="" full_from_files=0 unknown=0 -playbook="ansible/playbooks/${machine}.yml" add_tag() { case ",$tags," in @@ -61,28 +63,23 @@ if [ "$full" -eq 0 ] && [ -n "$changed" ]; then for file in $changed; do [ -n "$file" ] || continue case "$file" in - ansible/ansible.cfg | ansible/ci/* | ansible/roles/host/* | ansible/playbooks/host.yml | ansible/playbooks/site.yml | ansible/playbooks/"$machine".yml | ansible/inventories/prod/hosts.yml | ansible/inventories/prod/group_vars/* | ansible/inventories/prod/host_vars/"$machine".yml) + ansible/ansible.cfg | ansible/roles/host/* | ansible/playbooks/host.yml | ansible/playbooks/site.yml | ansible/playbooks/"$machine".yml | ansible/inventories/prod/hosts.yml | ansible/inventories/prod/group_vars/* | ansible/inventories/prod/host_vars/"$machine".yml) full_from_files=1 ;; - ansible/roles/netbird_client/*) - case "$machine" in - core-net | ger-nod-02) add_tag netbird ;; - esac - ;; - ansible/roles/netbird_exit_node/*) - case "$machine" in - ger-nod-02) add_tag netbird ;; - esac + ansible/roles/netbird_client/* | ansible/roles/netbird_exit_node/*) + if grep -qE "role: (netbird_client|netbird_exit_node)" "$playbook"; then + add_tag netbird + fi ;; ansible/roles/remnanode/*) - case "$machine" in - ger-nod-02) add_tag remnanode ;; - esac + if grep -q "role: remnanode" "$playbook"; then + add_tag remnanode + fi ;; ansible/roles/vmagent/*) - case "$machine" in - core-net | ger-nod-02) add_tag vmagent ;; - esac + if grep -q "role: vmagent" "$playbook"; then + add_tag vmagent + fi ;; ansible/roles/"$machine"/.ci-trigger) ;; diff --git a/ansible/ci/deploy-machine.sh b/ansible/ci/deploy-machine.sh index 9a4d3d8..e8f259f 100755 --- a/ansible/ci/deploy-machine.sh +++ b/ansible/ci/deploy-machine.sh @@ -7,19 +7,22 @@ machine=${1:?machine} event=${2:-} before=${3:-} after=${4:-} +override_tags=${5:-} + +root=$(CDPATH= cd -- "$(dirname "$0")/../.." && pwd) case "$machine" in core-git) echo "core-git с раннера не деплоится: job выполняется на этой же машине и снесёт Gitea вместе с собой. Плейбук — только с рабочей станции." >&2 exit 2 ;; - core-net | core-secrets | core-mon | rus-central | ger-nod-02 | opnsense) ;; - *) - echo "Неизвестная машина: $machine" >&2 - exit 2 - ;; esac +if [ "$machine" = "site" ] || [ "$machine" = "host" ] || [ ! -f "$root/ansible/playbooks/${machine}.yml" ]; then + echo "Неизвестная машина: $machine" >&2 + exit 2 +fi + if [ -z "${INFISICAL_CLIENT_ID:-}" ] || [ -z "${INFISICAL_CLIENT_SECRET:-}" ]; then echo "Нет INFISICAL_CLIENT_ID или INFISICAL_CLIENT_SECRET" >&2 exit 1 @@ -115,10 +118,10 @@ case "$machine" in export OPNSENSE_API_KEY="${OPNSENSE_API_KEY:-}" export OPNSENSE_API_SECRET="${OPNSENSE_API_SECRET:-}" ;; - ger-nod-02) + *-nod-*) # SECRET_KEY ноды — /services/remnawave (пишет ansible-core-net). eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/remnawave" --format=dotenv-export --silent)" - # Стартовый пароль VPS — как ansible_password у rus-central, только из Infisical /VPS. + # Стартовый пароль VPS — /VPS/PASS_. eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/VPS" --format=dotenv-export --silent)" # CLOUDFLARE_API уже из /ci-cd выше (только A-запись, без DNS-01). export REMNANODE_SECRET_KEY="${REMNANODE_SECRET_KEY:-}" @@ -126,36 +129,36 @@ case "$machine" in export NETBIRD_API_TOKEN="${NETBIRD_API_TOKEN:-}" export NETBIRD_REMNAWAVE_SETUP_KEY="${NETBIRD_REMNAWAVE_SETUP_KEY:-}" export CLOUDFLARE_API="${CLOUDFLARE_API:-}" - export PASS_GER_NOD_02="${PASS_GER_NOD_02:-}" + pass_var="PASS_${machine^^}" + pass_var="${pass_var//-/_}" + vps_pass="${!pass_var:-}" if [ -z "${REMNANODE_SECRET_KEY}" ]; then - echo "В Infisical (/services/remnawave) нет REMNANODE_SECRET_KEY — сначала прогоните ansible-core-net (роль remnawave)." >&2 + echo "В Infisical (/services/remnawave) нет REMNANODE_SECRET_KEY — сначала прогоните core-net (роль remnawave)." >&2 exit 1 fi if [ -z "${CLOUDFLARE_API}" ]; then echo "В Infisical (/ci-cd) нет CLOUDFLARE_API" >&2 exit 1 fi - if [ -z "${PASS_GER_NOD_02}" ]; then - echo "В Infisical (/VPS) нет PASS_GER_NOD_02 — нужен для первичного SSH на ger-nod-02" >&2 + if [ -z "${vps_pass}" ]; then + echo "В Infisical (/VPS) нет ${pass_var} — нужен для первичного SSH на ${machine}" >&2 exit 1 fi - # sshpass — как при первом прогоне rus-central с ansible_password. if ! command -v sshpass >/dev/null 2>&1; then apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq sshpass >/dev/null fi export ANSIBLE_HOST_KEY_CHECKING=False - ger_extra=$(mktemp) - python3 -c 'import json,os; print(json.dumps({"ansible_password": os.environ["PASS_GER_NOD_02"]}))' >"$ger_extra" - extra+=(-e "@${ger_extra}") - trap 'rm -f "${HOME}/.ssh/id_ed25519" "'"$ger_extra"'"' EXIT + vps_extra=$(mktemp) + VPS_PASS="$vps_pass" python3 -c 'import json,os; print(json.dumps({"ansible_password": os.environ["VPS_PASS"]}))' >"$vps_extra" + extra+=(-e "@${vps_extra}") + trap 'rm -f "${HOME}/.ssh/id_ed25519" "'"$vps_extra"'"' EXIT ;; esac -root=$(CDPATH= cd -- "$(dirname "$0")/../.." && pwd) cd "$root" target_file=$(mktemp) -bash ansible/ci/ansible-target.sh "$machine" "$event" "$before" "$after" > "$target_file" +bash ansible/ci/ansible-target.sh "$machine" "$event" "$before" "$after" "$override_tags" > "$target_file" mapfile -t target < "$target_file" rm -f "$target_file" diff --git a/ansible/inventories/prod/hosts.yml b/ansible/inventories/prod/hosts.yml index 1f00e27..77b03c3 100644 --- a/ansible/inventories/prod/hosts.yml +++ b/ansible/inventories/prod/hosts.yml @@ -26,3 +26,7 @@ all: opnsense: ansible_host: 192.168.1.1 ansible_connection: local + children: + exit_nodes: + hosts: + ger-nod-02: diff --git a/ansible/roles/core-net/remnawave/files/nodes.yml b/ansible/roles/core-net/remnawave/files/nodes.yml index 3b79041..72bd41a 100644 --- a/ansible/roles/core-net/remnawave/files/nodes.yml +++ b/ansible/roles/core-net/remnawave/files/nodes.yml @@ -19,3 +19,4 @@ nodes: selfsteal_domain: "yali.gunis.top" xhttp_path: "/xhttp-yali" host_remark: "🇩🇪 ger-nod-02" + diff --git a/ansible/roles/core-net/remnawave/files/sync_remnawave.py b/ansible/roles/core-net/remnawave/files/sync_remnawave.py index acc92aa..52d4dcf 100644 --- a/ansible/roles/core-net/remnawave/files/sync_remnawave.py +++ b/ansible/roles/core-net/remnawave/files/sync_remnawave.py @@ -590,3 +590,4 @@ def main() -> int: if __name__ == "__main__": raise SystemExit(main()) + diff --git a/ansible/roles/core-net/remnawave/tasks/bootstrap.yml b/ansible/roles/core-net/remnawave/tasks/bootstrap.yml index 689652a..f927ad3 100644 --- a/ansible/roles/core-net/remnawave/tasks/bootstrap.yml +++ b/ansible/roles/core-net/remnawave/tasks/bootstrap.yml @@ -370,3 +370,4 @@ retries: 30 delay: 2 until: (remnawave_sub_health.stdout | trim) == 'healthy' + diff --git a/ansible/roles/core-net/remnawave/tasks/sync.yml b/ansible/roles/core-net/remnawave/tasks/sync.yml index bb69723..188436c 100644 --- a/ansible/roles/core-net/remnawave/tasks/sync.yml +++ b/ansible/roles/core-net/remnawave/tasks/sync.yml @@ -57,3 +57,4 @@ remnawave_sync: "{{ remnawave_sync_raw.stdout | from_json }}" remnawave_xray_checker_url: "{{ (remnawave_sync_raw.stdout | from_json).xray_checker_subscription_url | default('') }}" no_log: true + diff --git a/ansible/roles/netbird_exit_node/defaults/main.yml b/ansible/roles/netbird_exit_node/defaults/main.yml index 2c7c151..d7ff088 100644 --- a/ansible/roles/netbird_exit_node/defaults/main.yml +++ b/ansible/roles/netbird_exit_node/defaults/main.yml @@ -3,3 +3,4 @@ netbird_exit_group: "exit-{{ inventory_hostname }}" netbird_exit_clients_group: "exit-clients" netbird_exit_network_id: "exit-{{ inventory_hostname }}" netbird_exit_route_description: "Exit Node {{ inventory_hostname }} (0.0.0.0/0)" +