1618

files/ansible-playbooks/sot-updater.yml

@@ -1154,18 +1154,25 @@
             | ternary(dev2_auth_lldp6.stdout | default('') | trim, 'NONE')
           }}
 
-    - name: Dev2 | IPv6 LLDP passfile decision
-      when:
-        - tunnel_ok | default(false)
-        - dev2_passfile_used == 'NONE'
-        - (dev2_passfile_used_lldp is not defined or dev2_passfile_used_lldp == 'NONE')
-        - lldp_dev2_ip6 is defined
-        - lldp_dev2_ip6 | length > 0
-      delegate_to: localhost
-      debug:
-        msg:
-          - "Using passfile for LLDP IPv6 path: {{ dev2_passfile_used_lldp6 | default('NONE') }}"
 
+    - name: Indoor | Compute resolved IP for NetBox indoor_ip
+      delegate_to: localhost
+      set_fact:
+        indoor_conn_ip: >-
+          {%- if (tunnel_ok | default(false)) and (dev2_passfile_used | default('NONE')) != 'NONE' -%}
+            {{ dev2_host }}
+          {%- elif (dev2_passfile_used_lldp is defined)
+                  and (dev2_passfile_used_lldp | default('NONE')) != 'NONE'
+                  and (lldp_dev2_ip | default('') | length) > 0 -%}
+            {{ lldp_dev2_ip }}
+          {%- elif (dev2_passfile_used_lldp6 is defined)
+                  and (dev2_passfile_used_lldp6 | default('NONE')) != 'NONE'
+                  and (lldp_dev2_ip6 | default('') | length) > 0 -%}
+            {{ lldp_dev2_ip6 }}
+          {%- else -%}
+            na
+          {%- endif -%}
+      changed_when: false
 
     - name: Publish Dev2 indoor_ip custom field
       delegate_to: localhost
@@ -1185,12 +1192,24 @@
             'inscope_device': (ansible_hostname|default(inventory_hostname)),
             'task_name': 'custom_field_set',
             'task_add1': 'indoor_ip',
-            'task_result': (indoor_conn_ip | default('na'))
+            'task_result': indoor_conn_ip
           } | to_json }}"
           payload_encoding: "string"
       changed_when: false
 
 
+    - name: Dev2 | IPv6 LLDP passfile decision
+      when:
+        - tunnel_ok | default(false)
+        - dev2_passfile_used == 'NONE'
+        - (dev2_passfile_used_lldp is not defined or dev2_passfile_used_lldp == 'NONE')
+        - lldp_dev2_ip6 is defined
+        - lldp_dev2_ip6 | length > 0
+      delegate_to: localhost
+      debug:
+        msg:
+          - "Using passfile for LLDP IPv6 path: {{ dev2_passfile_used_lldp6 | default('NONE') }}"
+
     - name: Dev2 | Read firmux (LLDP IPv6 via Dev1)
       when:
         - tunnel_ok | default(false)