2256

files/ansible-playbooks/update-indoor4.yml

@@ -128,42 +128,35 @@
 
     - name: Capture LLDP-derived DEV2 IP (if any)
       ansible.builtin.set_fact:
-        lldp_dev2_ip: "{{ (dev2_lldp_ip_raw.stdout | default('')) | trim }}"
+        lldp_dev2_ip: >-
-      changed_when: false
+          {{ hostvars[inventory_hostname].lldp_dev2_ip
+            if (hostvars[inventory_hostname].lldp_dev2_ip is defined)
+            else (lldp_dev2_ip | default('')) }}
 
-    - name: Classify LLDP candidate range
+    - name: Classify LLDP candidate via regex (10.x.x.x / other / none)
-      delegate_to: localhost
       ansible.builtin.set_fact:
         lldp_ip_class: >-
-          {% set ip = (lldp_dev2_ip | default('')) %}
+          {% if lldp_dev2_ip is not defined or lldp_dev2_ip | trim == '' %}
-          {% if ip == '' %}none
+          none
-          {% elif ip.startswith('10.') %}10
+          {% elif lldp_dev2_ip | regex_search('^10\\.') %}
-          {% elif ip.startswith('192.168.') %}192_168
+          10
-          {% else %}other{% endif %}
+          {% else %}
-      changed_when: false
+          other
+          {% endif %}
 
-    - name: Debug LLDP candidate and classification (new debug)
+    - name: Debug LLDP candidate and classification (regex-based)
-      when: debugging | bool
-      delegate_to: localhost
       ansible.builtin.debug:
         msg:
-          - "LLDP digits={{ dev2_lldp_digits | default('') }}"
+          - "LLDP digits={{ lldp_digits | default('') }}"
           - "LLDP candidate IP={{ lldp_dev2_ip | default('<none>') }}"
-          - "LLDP class={{ lldp_ip_class | default('none') }}"
+          - "LLDP class={{ lldp_ip_class | default('<unset>') }}"
-
-    # Decide dev2_conn_method = direct_lldp for 10.x, tunnel otherwise
-    - name: Set connection method to tunnel by default
-      delegate_to: localhost
-      ansible.builtin.set_fact:
-        dev2_conn_method: "tunnel"
-      changed_when: false
 
     - name: Switch to direct LLDP mode for 10.x.x.x
-      when: lldp_ip_class == "10"
-      delegate_to: localhost
       ansible.builtin.set_fact:
         dev2_conn_method: "direct_lldp"
-      changed_when: false
+      when:
+        - lldp_ip_class | trim == '10'
+
 
     - name: Debug connection method decision (new debug)
       when: debugging | bool