1021

files/ansible-playbooks/sot-updater.yml

@@ -57,12 +57,12 @@
       set_fact:
         dev1_fw_clean: >-
           {{
-            (
             (dev1_banner.stdout | default('') | trim)
-              | regex_findall('([0-9]+\\.[0-9]+\\.[0-9]+\\s+[Rr][Ee][Vv]\\.??\\s*\\d+)')
-            ) | first | default('')
+            | regex_search('(?i)[0-9]+\\.[0-9]+\\.[0-9]+\\s+rev\\s+[0-9]+')
+            | default('')
           }}
 
+
     - name: Dev1 | Debug normalized fw string to be published
       delegate_to: localhost
       debug:
@@ -71,6 +71,7 @@
 
     - name: Dev2 | Build payload preview string
       when:
+        - dev2_passfile_used is defined
         - dev2_passfile_used != "NONE"
         - indoor_fw_norm is defined
         - (indoor_fw_norm | length) > 0
@@ -91,6 +92,7 @@
             } | to_json
           }}
 
+
     - name: Dev1 | Debug EXACT publish body (payload preview)
       delegate_to: localhost
       debug: