From 02e567730a90d0c83ab74a6b99cea2ccaec5587e Mon Sep 17 00:00:00 2001 From: pavel Date: Tue, 28 Oct 2025 09:41:22 +0200 Subject: [PATCH] 0941 --- files/ansible-playbooks/sot-updater.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/files/ansible-playbooks/sot-updater.yml b/files/ansible-playbooks/sot-updater.yml index 0c4dfba..5475e56 100644 --- a/files/ansible-playbooks/sot-updater.yml +++ b/files/ansible-playbooks/sot-updater.yml @@ -218,8 +218,12 @@ debug: msg: "Dev1 fw_version {{ dev1_fw_clean | default('N/A') }}" - # ---- Coalesced read of NetBox custom field for Dev1 (handles different inventory shapes) - - name: NetBox | Current custom fw_version + # ---- Defensive deep grep (catches fw_version anywhere in hostvars JSON) + - name: Hostvars JSON (for deep grep) + set_fact: + _hostvars_json: "{{ hostvars[inventory_hostname] | to_nice_json }}" + + - name: NetBox | Current custom fw_version (coalesced) set_fact: nb_fw_version: >- {{ @@ -242,6 +246,11 @@ hostvars[inventory_hostname].fw_version | default('', true) ) + or + ( + _hostvars_json | regex_search('\"fw_version\"\\s*:\\s*\"([^\"]*)\"', '\\1') + | default('', true) + ) | string | trim }} @@ -346,8 +355,8 @@ | trim }} - # ---- Coalesced read of NetBox custom field for Dev2 (handles different inventory shapes) - - name: NetBox | Current custom indoor_fwver + # ---- Defensive deep grep (catches indoor_fwver anywhere in hostvars JSON) + - name: NetBox | Current custom indoor_fwver (coalesced) set_fact: nb_indoor_fwver: >- {{ @@ -370,6 +379,11 @@ hostvars[inventory_hostname].indoor_fwver | default('', true) ) + or + ( + _hostvars_json | regex_search('\"indoor_fwver\"\\s*:\\s*\"([^\"]*)\"', '\\1') + | default('', true) + ) | string | trim }}