diff --git a/ansible/roles/opnsense/xray/tasks/main.yml b/ansible/roles/opnsense/xray/tasks/main.yml index 793e724..04f7abc 100644 --- a/ansible/roles/opnsense/xray/tasks/main.yml +++ b/ansible/roles/opnsense/xray/tasks/main.yml @@ -142,6 +142,10 @@ vars: cur: "{{ item.1.json.instance }}" want: "{{ xray_payloads[item.0.name] }}" + # loglevel — OptionField: getItem отдаёт не строку, а список опций + # с флагами selected. Вытаскиваем ключ выбранной опции. + cur_loglevel_sel: "{{ cur.loglevel | dict2items | default([]) | selectattr('value.selected', 'equalto', 1) | map(attribute='key') | list }}" + cur_loglevel: "{{ cur_loglevel_sel[0] if cur_loglevel_sel | length > 0 else '' }}" drift: >- {{ (cur.outbound_config | default('') | from_json) != (want.outbound_config | from_json) or cur.name != want.name @@ -151,7 +155,7 @@ or (cur.tun_interface | default('')) != want.tun_interface or (cur.mtu | string) != want.mtu or (cur.bypass_networks | default('')) != want.bypass_networks - or (cur.loglevel | default('')) != want.loglevel }} + or cur_loglevel != want.loglevel }} loop: "{{ xray_current.json.rows | default([]) | selectattr('name', 'in', xray_desired | map(attribute='name') | list) | list | zip(xray_existing.results) | list }}" loop_control: label: "{{ item.0.name }}"