From 7782cb0620db17d68da39e76dc46f5074f8c85c5 Mon Sep 17 00:00:00 2001 From: pavel Date: Tue, 18 Nov 2025 16:36:24 +0200 Subject: [PATCH] 1636 --- files/ansible-playbooks/sot-updater.yml | 49 +++++++++++++++++++------ 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/files/ansible-playbooks/sot-updater.yml b/files/ansible-playbooks/sot-updater.yml index 3f44bca..f392e33 100644 --- a/files/ansible-playbooks/sot-updater.yml +++ b/files/ansible-playbooks/sot-updater.yml @@ -634,6 +634,7 @@ set_fact: dev2_passfile_used: "{{ (dev2_auth.rc == 0)|ternary(dev2_auth.stdout|trim,'NONE') }}" + # ------ LLDP candidate IP when Dev2 login failed (tunnel up but Dev2 unreachable) ------ - name: Dev1 | Try LLDP-derived Dev2 IP (auth to Dev2 failed) when: @@ -657,22 +658,40 @@ delegate_to: localhost debug: msg: - - "LLDP-derived Dev2 IP (best-effort): {{ (lldp_ip_raw.stdout | default('') | trim) if ((lldp_ip_raw.stdout | default('') | trim | length) > 0) else '' }}" + - >- + LLDP-derived Dev2 IP (raw best-effort): + {{ + (lldp_ip_raw.stdout | default('') | trim) + if ((lldp_ip_raw.stdout | default('') | trim | length) > 0) + else '' + }} + - >- + LLDP 10.0.0.0/8 usable: + {{ + ((lldp_ip_raw.stdout | default('') | trim) is match('^10\.')) + | ternary('yes (10/8)', 'no (not 10/8) or none') + }} - # ------ NEW: Try direct SSH to LLDP IP from localhost (no extra tunnel) ------ - - name: Set LLDP IP fact + # Filter LLDP IP: only keep it if it is 10.0.0.0/8, otherwise blank it out + - name: Set LLDP IP fact (10.0.0.0/8 only) when: - tunnel_ok | default(false) - dev2_passfile_used == 'NONE' delegate_to: localhost set_fact: - lldp_dev2_ip: "{{ lldp_ip_raw.stdout | default('') | trim }}" + lldp_dev2_ip_raw: "{{ lldp_ip_raw.stdout | default('') | trim }}" + lldp_dev2_ip: >- + {{ + (lldp_ip_raw.stdout | default('') | trim) + if ((lldp_ip_raw.stdout | default('') | trim) is match('^10\.')) + else '' + }} - name: Try DEV2 login via direct LLDP IP when: - tunnel_ok | default(false) - dev2_passfile_used == 'NONE' - - lldp_dev2_ip | length > 0 + - lldp_dev2_ip | length > 0 # only if 10.0.0.0/8 delegate_to: localhost shell: | for f in basicpass basicpass2; do @@ -693,7 +712,7 @@ when: - tunnel_ok | default(false) - dev2_passfile_used == 'NONE' - - lldp_dev2_ip | length > 0 + - lldp_dev2_ip | length > 0 # only if 10.0.0.0/8 delegate_to: localhost debug: msg: @@ -705,17 +724,21 @@ when: - tunnel_ok | default(false) - dev2_passfile_used == 'NONE' - - lldp_dev2_ip | length > 0 + - lldp_dev2_ip | length > 0 # only if 10.0.0.0/8 delegate_to: localhost set_fact: - dev2_passfile_used_lldp: "{{ (dev2_auth_lldp.rc | default(1)) == 0 | ternary(dev2_auth_lldp.stdout | default('') | trim, 'NONE') }}" + dev2_passfile_used_lldp: >- + {{ + ((dev2_auth_lldp.rc | default(1)) == 0) + | ternary(dev2_auth_lldp.stdout | default('') | trim, 'NONE') + }} # Debug 2: which passfile will be used for firmux read - name: Dev2 | LLDP passfile decision when: - tunnel_ok | default(false) - dev2_passfile_used == 'NONE' - - lldp_dev2_ip | length > 0 + - lldp_dev2_ip | length > 0 # only if 10.0.0.0/8 delegate_to: localhost debug: msg: @@ -726,7 +749,7 @@ when: - tunnel_ok | default(false) - dev2_passfile_used == 'NONE' - - lldp_dev2_ip | length > 0 + - lldp_dev2_ip | length > 0 # only if 10.0.0.0/8 delegate_to: localhost shell: "nc -z -w3 {{ lldp_dev2_ip }} 22" register: lldp_ssh_tcp @@ -738,7 +761,7 @@ when: - tunnel_ok | default(false) - dev2_passfile_used == 'NONE' - - lldp_dev2_ip | length > 0 + - lldp_dev2_ip | length > 0 # only if 10.0.0.0/8 - dev2_passfile_used_lldp != 'NONE' delegate_to: localhost shell: | @@ -751,6 +774,10 @@ failed_when: false ignore_errors: true + + + + # ------ Mux: choose whichever firmux output succeeded ------ - name: Dev2 | Choose firmux output (tunnel or LLDP) delegate_to: localhost