From 7aef3fe063992319b38b86e93eb6164695fb4b5c Mon Sep 17 00:00:00 2001 From: karpenok Date: Thu, 12 Nov 2026 22:05:38 +0700 Subject: [PATCH] =?UTF-8?q?fix(opnsense):=20=D0=BD=D0=B5=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=B4=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=20first=20=D0=BF=D0=BE?= =?UTF-8?q?=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20=D0=BF=D0=BE=D1=81?= =?UTF-8?q?=D0=BB=D0=B5=D0=B4=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B8=D1=81=D0=BA=D0=B5=20uuid=20=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D0=B2=D0=BD=D0=BE=D0=B9=20=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/opnsense/xray/tasks/main.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ansible/roles/opnsense/xray/tasks/main.yml b/ansible/roles/opnsense/xray/tasks/main.yml index 1b1becf..d8213ab 100644 --- a/ansible/roles/opnsense/xray/tasks/main.yml +++ b/ansible/roles/opnsense/xray/tasks/main.yml @@ -168,9 +168,17 @@ ansible.builtin.set_fact: xray_active_uuid: "{{ uuid }}" vars: - uuid: "{{ (xray_added.results | default([]) | selectattr('item.name', 'equalto', active_name) | map(attribute='json.uuid') | first) - or (xray_current.json.rows | default([]) | selectattr('name', 'equalto', active_name) | map(attribute='uuid') | first) }}" + # first на пустой последовательности — фатальная ошибка, поэтому list + индекс active_name: "{{ xray_desired | selectattr('active') | map(attribute='name') | first }}" + all_uuids: "{{ (xray_added.results | default([]) | selectattr('item.name', 'equalto', active_name) | map(attribute='json.uuid') | list) + + (xray_current.json.rows | default([]) | selectattr('name', 'equalto', active_name) | map(attribute='uuid') | list) }}" + uuid: "{{ all_uuids[0] if all_uuids | length > 0 else '' }}" + +- name: Проверить, что активная подписка найдена в OPNsense + ansible.builtin.assert: + that: + - xray_active_uuid | length > 0 + fail_msg: "Активная подписка не найдена в OPNsense после синхронизации инстансов." - name: Провалидировать конфиг активной подписки ansible.builtin.uri: