From 852fc21e8c68dcd19d3b238ee12aea4a3867a8ca Mon Sep 17 00:00:00 2001
From: pavel <pavel.larkin@ikeja.co.za>
Date: Wed, 10 Jun 2026 11:12:34 +0300
Subject: [PATCH] 1112

---
 files/ansible-playbooks/sot-updater.yml | 27 +++++++++++--------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/files/ansible-playbooks/sot-updater.yml b/files/ansible-playbooks/sot-updater.yml
index c41d4c2..e786195 100644
--- a/files/ansible-playbooks/sot-updater.yml
+++ b/files/ansible-playbooks/sot-updater.yml
@@ -1706,7 +1706,7 @@
       delegate_to: localhost
       shell: |
         PORT="{{ _local_port }}"
-        sshpass -f "{{ dev2_passfile_used }}" ssh {{ ssh_opts_common }} -o ConnectTimeout={{ ssh_timeout }} -p "$PORT" "{{ dev2_ssh_user }}@127.0.0.1" 'f=$(ls -1 /root/prepared_backup_* 2>/dev/null | head -n1); f=${f##*/}; printf "%s\n" "$f" | sed -nE "s/^prepared_backup_.*-([0-9]+\.[0-9]+\.[0-9]+)-r([0-9]+)$/\1 rev \2/p"'
+        sshpass -f "{{ dev2_passfile_used }}" ssh {{ ssh_opts_common }} -o ConnectTimeout={{ ssh_timeout }} -p "$PORT" "{{ dev2_ssh_user }}@127.0.0.1" "f=$(ls -1 /root/prepared_backup_* 2>/dev/null | head -n1); f=${f##*/prepared_backup_}; v=${f%-r*}; r=${f##*-r}; [ -n "$v" ] && [ -n "$r" ] && echo "$v rev $r" || true"
       args:
         executable: /bin/bash
       register: dev2_fwver_backup_marker_tunnel
@@ -1723,7 +1723,7 @@
         - dev2_passfile_used_lldp != 'NONE'
       delegate_to: localhost
       shell: |
-        sshpass -f "{{ dev2_passfile_used_lldp }}" ssh -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -o ConnectTimeout=15 "{{ dev2_ssh_user }}@{{ lldp_dev2_ip }}" 'f=$(ls -1 /root/prepared_backup_* 2>/dev/null | head -n1); f=${f##*/}; printf "%s\n" "$f" | sed -nE "s/^prepared_backup_.*-([0-9]+\.[0-9]+\.[0-9]+)-r([0-9]+)$/\1 rev \2/p"'
+        sshpass -f "{{ dev2_passfile_used_lldp }}" ssh -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -o ConnectTimeout=15 "{{ dev2_ssh_user }}@{{ lldp_dev2_ip }}" "f=$(ls -1 /root/prepared_backup_* 2>/dev/null | head -n1); f=${f##*/prepared_backup_}; v=${f%-r*}; r=${f##*-r}; [ -n "$v" ] && [ -n "$r" ] && echo "$v rev $r" || true"
       args:
         executable: /bin/bash
       register: dev2_fwver_backup_marker_lldp
@@ -1748,7 +1748,7 @@
           exit 0
         fi
 
-        sshpass -p '{{ dev1_pass }}' ssh {{ ssh_opts_common }} "{{ dev1_user }}@{{ ansible_host|default(inventory_hostname) }}" "sshpass -f '/tmp/${F}' ssh -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -o ConnectTimeout={{ ssh_timeout }} '{{ dev2_ssh_user }}@\[${IP6}%{{ dev1_iface }}\]' 'f=\$(ls -1 /root/prepared_backup_* 2>/dev/null | head -n1); f=\${f##*/}; printf \"%s\n\" \"\$f\" | sed -nE \"s/^prepared_backup_.*-([0-9]+\.[0-9]+\.[0-9]+)-r([0-9]+)$/\\1 rev \\2/p\"'"
+        sshpass -p '{{ dev1_pass }}' ssh {{ ssh_opts_common }} "{{ dev1_user }}@{{ ansible_host|default(inventory_hostname) }}" "sshpass -f '/tmp/${F}' ssh -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -o ConnectTimeout={{ ssh_timeout }} '{{ dev2_ssh_user }}@\[${IP6}%{{ dev1_iface }}\]' 'f=\$(ls -1 /root/prepared_backup_* 2>/dev/null | head -n1); f=\${f##*/prepared_backup_}; v=\${f%-r*}; r=\${f##*-r}; [ -n "\$v" ] && [ -n "\$r" ] && echo "\$v rev \$r" || true'"
       args:
         executable: /bin/bash
       register: dev2_fwver_backup_marker_lldp6
@@ -1756,8 +1756,6 @@
       failed_when: false
       ignore_errors: true
 
-
-
     - name: Dev2 | Select bootbanks backup firmux output
       delegate_to: localhost
       set_fact:
@@ -1819,15 +1817,6 @@
           - "lldp4 rc={{ dev2_fwver_backup_lldp.rc | default('n/a') }} out={{ dev2_fwver_backup_lldp.stdout | default('') | trim }} err={{ dev2_fwver_backup_lldp.stderr | default('') | trim }}"
           - "lldp6 rc={{ dev2_fwver_backup_lldp6.rc | default('n/a') }} out={{ dev2_fwver_backup_lldp6.stdout | default('') | trim }} err={{ dev2_fwver_backup_lldp6.stderr | default('') | trim }}"
 
-    - name: Dev2 | indoor_fwver_backup marker debug
-      delegate_to: localhost
-      debug:
-        msg:
-          - "marker tunnel rc={{ dev2_fwver_backup_marker_tunnel.rc | default('n/a') }} out={{ dev2_fwver_backup_marker_tunnel.stdout | default('') | trim }} err={{ dev2_fwver_backup_marker_tunnel.stderr | default('') | trim }}"
-          - "marker lldp4 rc={{ dev2_fwver_backup_marker_lldp.rc | default('n/a') }} out={{ dev2_fwver_backup_marker_lldp.stdout | default('') | trim }} err={{ dev2_fwver_backup_marker_lldp.stderr | default('') | trim }}"
-          - "marker lldp6 rc={{ dev2_fwver_backup_marker_lldp6.rc | default('n/a') }} out={{ dev2_fwver_backup_marker_lldp6.stdout | default('') | trim }} err={{ dev2_fwver_backup_marker_lldp6.stderr | default('') | trim }}"
-          - "selected indoor_fwver_backup_raw={{ indoor_fwver_backup_raw | default('') | trim }}"
-
     - name: Dev2 | indoor_fwver_backup final debug
       delegate_to: localhost
       debug:
@@ -2469,7 +2458,15 @@
                   (dev2_defgw_lldp6 is defined) and
                   ((dev2_defgw_lldp6.stdout | default('') | trim | length) > 0)
                 )
-                else ''
+                else (
+                  'ppp0'
+                  if ((dev2_ppp0_ip.stdout | default('') | trim) is match('^10\.'))
+                  else (
+                    'eth0.4000'
+                    if ((dev2_eth04000_ip.stdout | default('') | trim) is match('^10\.'))
+                    else ''
+                  )
+                )
               )
             )
           }}