From 30947877e69582f150297d88ac96394e46fbd795 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Tue, 20 Feb 2024 15:19:10 +0930
Subject: [PATCH] fix(server): new hosts wont be in db, don't search with id

!1
---
 playbooks/server.yaml                   | 6 ++----
 playbooks/tasks/server/subnet_scan.yaml | 8 +++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/playbooks/server.yaml b/playbooks/server.yaml
index f29a454..176af38 100644
--- a/playbooks/server.yaml
+++ b/playbooks/server.yaml
@@ -53,10 +53,8 @@
     - name: Process Scan results
       ansible.builtin.include_tasks:
         file: tasks/server/subnet_scan.yaml
-      loop: "{{ inbound_data.scan }}"
-      loop_control:
-        loop_var: scan_result
-        label: "{{ scan_result }}"
+      vars:
+        scan_result: "{{ inbound_data.scan.results }}"
 
 
   vars:
diff --git a/playbooks/tasks/server/subnet_scan.yaml b/playbooks/tasks/server/subnet_scan.yaml
index f7c3a5f..5b6c5e9 100644
--- a/playbooks/tasks/server/subnet_scan.yaml
+++ b/playbooks/tasks/server/subnet_scan.yaml
@@ -14,12 +14,14 @@
         id, description, state, note, lastSeen
       FROM ipaddresses
       WHERE
-        id='{{ ipaddress.id }}'
-          AND
+        {% if ipaddress.id is defined %}
+          id='{{ ipaddress.id }}'
+            AND
+        {% endif %}
         ip_addr='{{ ipaddress.ip | ip2ipam }}'
     single_transaction: true
   register: mysql_query_find_ipaddress
-  loop: "{{ scan_result.results }}"
+  loop: "{{ scan_result }}"
   loop_control:
     loop_var: ipaddress