From 7e80cfaa0efc09616cd882e8b842c2fcbc493ea8 Mon Sep 17 00:00:00 2001
From: "Ketelsen, Sven" <sven.ketelsen@netgo.de>
Date: Wed, 30 Nov 2022 07:43:33 +0000
Subject: [PATCH] DEV-711 use servers without shared_service_network

---
 group_vars/all/plain.yml         |  5 +++--
 tasks/autodiscover_pre_tasks.yml | 14 +++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml
index e03fbf9..da3eed8 100644
--- a/group_vars/all/plain.yml
+++ b/group_vars/all/plain.yml
@@ -131,12 +131,13 @@ smardigo_plattform_users: "{{ default_plattform_users + custom_plattform_users |
 ip_whitelist_admins:
   - "79.215.12.94/32" # sven
 
-ip_whitelist:
+ip_whitelist_netgo:
   - "212.121.131.106/32" # netgo berlin
   - "149.233.6.129/32" # netgo e-shelter
   - "46.245.219.98/32" # netgo borken
   - "164.138.195.162/32" # netgo Aachen
-  - "{{ shared_service_network }}"
+
+ip_whitelist: "{{ ip_whitelist_netgo + [shared_service_network] }}"
 
 offsite_storage_server_ip: 142.132.155.83/32
 
diff --git a/tasks/autodiscover_pre_tasks.yml b/tasks/autodiscover_pre_tasks.yml
index c84095c..c78f616 100644
--- a/tasks/autodiscover_pre_tasks.yml
+++ b/tasks/autodiscover_pre_tasks.yml
@@ -101,11 +101,15 @@
       {% set  list= [] %}\
       {% for server in hetzner_servers %}\
         {% if server.labels.manual is not defined %}\
-          {% for private_net in server.private_net %}\
-            {% if private_net.network == stage_private_network_id|int %}\
-              {{ list.append({'service': server.labels.service, 'private_ip': private_net.ip, 'public_ip': server.public_net.ipv4.ip, 'name': server.name, 'id': server.id}) }}\
-            {% endif %}\
-          {% endfor %}\
+          {% if (server.private_net|length) > 0 %}\
+            {% for private_net in server.private_net %}\
+              {% if private_net.network == stage_private_network_id|int %}\
+                {{ list.append({'service': server.labels.service, 'private_ip': private_net.ip, 'public_ip': server.public_net.ipv4.ip, 'name': server.name, 'id': server.id}) }}\
+              {% endif %}\
+            {% endfor %}\
+          {% else %}\
+            {{ list.append({'service': server.labels.service, 'private_ip': '-', 'public_ip': server.public_net.ipv4.ip, 'name': server.name, 'id': server.id}) }}\
+          {% endif %}\
         {% endif %}\
       {% endfor %}\
       {{ list|list }}"