From b6d6db9e2cec46d15aeeb837ba9c5396bcbce58d Mon Sep 17 00:00:00 2001 From: karpenok Date: Thu, 12 Nov 2026 16:59:30 +0700 Subject: [PATCH] =?UTF-8?q?fix(remnawave):=20=D0=BD=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=D1=8C=20=D0=BD=D0=BE?= =?UTF-8?q?=D0=B4=D1=83=20=D0=BD=D0=B0=20NetBird,=20=D0=BF=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D1=8C=20=D1=81=D0=B0?= =?UTF-8?q?=D0=BC=D0=B0=20=D0=BD=D0=B5=20=D0=B2=20=D1=81=D0=B5=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Иначе панель без /dev/net/tun потеряет ger-nod-02, хотя peer ноды уже есть. Co-authored-by: Cursor --- ansible/roles/core-net/remnawave/tasks/main.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ansible/roles/core-net/remnawave/tasks/main.yml b/ansible/roles/core-net/remnawave/tasks/main.yml index 10e2d41..fe409cd 100644 --- a/ansible/roles/core-net/remnawave/tasks/main.yml +++ b/ansible/roles/core-net/remnawave/tasks/main.yml @@ -186,6 +186,12 @@ group: root mode: "0600" +- name: Проверить, что панель сама в NetBird + ansible.builtin.command: netbird status + register: remnawave_local_netbird + changed_when: false + failed_when: false + - name: Узнать NetBird IP ноды ansible.builtin.shell: | set -euo pipefail @@ -210,12 +216,16 @@ - name: Подставить NetBird-адрес ноды ansible.builtin.set_fact: remnawave_node_address: "{{ remnawave_node_nb.stdout | trim }}" - when: remnawave_node_nb.stdout | default('') | trim is match('^[0-9.]+$') + when: + - remnawave_node_nb.stdout | default('') | trim is match('^[0-9.]+$') + - "'Management: Connected' in (remnawave_local_netbird.stdout | default(''))" - name: Peer ноды ещё не в NetBird ansible.builtin.debug: - msg: "Peer {{ remnawave_node_netbird_hostname }} ещё не в сети, адрес ноды остаётся {{ remnawave_node_address }}" - when: remnawave_node_nb.stdout | default('') | trim is not match('^[0-9.]+$') + msg: "Адрес ноды остаётся {{ remnawave_node_address }}: панель ещё не в NetBird или peer {{ remnawave_node_netbird_hostname }} не найден." + when: >- + (remnawave_node_nb.stdout | default('') | trim is not match('^[0-9.]+$')) or + ('Management: Connected' not in (remnawave_local_netbird.stdout | default(''))) - name: Инициализировать админа, API-токен, профиль DE-Yali, ноду и хост ansible.builtin.shell: |