fix(opnsense): сравнивать loglevel OptionField по выбранной опции в drift-проверке
ansible-opnsense / deploy (push) Failing after 4s
ansible-opnsense / deploy (push) Failing after 4s
This commit is contained in:
1 parent
f0c2d2e5a5
commit
192d1414f2
1 file changed
+5
-1
@@ -142,6 +142,10 @@
|
|||||||
vars:
|
vars:
|
||||||
cur: "{{ item.1.json.instance }}"
|
cur: "{{ item.1.json.instance }}"
|
||||||
want: "{{ xray_payloads[item.0.name] }}"
|
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: >-
|
drift: >-
|
||||||
{{ (cur.outbound_config | default('') | from_json) != (want.outbound_config | from_json)
|
{{ (cur.outbound_config | default('') | from_json) != (want.outbound_config | from_json)
|
||||||
or cur.name != want.name
|
or cur.name != want.name
|
||||||
@@ -151,7 +155,7 @@
|
|||||||
or (cur.tun_interface | default('')) != want.tun_interface
|
or (cur.tun_interface | default('')) != want.tun_interface
|
||||||
or (cur.mtu | string) != want.mtu
|
or (cur.mtu | string) != want.mtu
|
||||||
or (cur.bypass_networks | default('')) != want.bypass_networks
|
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: "{{ xray_current.json.rows | default([]) | selectattr('name', 'in', xray_desired | map(attribute='name') | list) | list | zip(xray_existing.results) | list }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
label: "{{ item.0.name }}"
|
label: "{{ item.0.name }}"
|
||||||
|
|||||||
Reference in new issue
Block a user