Remove separate private and protected IP

ansible/group_vars/all/network.yml

@@ -1,2 +1 @@
 private_ip: "{{ nebula.clients[ansible_hostname].ip }}"
-protected_ip: "{{ private_ip }}"

ansible/group_vars/all/pve.yml

@@ -1,20 +1,17 @@
 pve_hosts:
   internal_cidr: 10.23.1.0/24
   ingress:
-    ip: 192.168.2.201
+    ip: 10.23.1.88
-    internal_ip: 10.23.1.88
   jellyfin:
-    ip: 192.168.2.46
+    ip: 10.23.1.29
-    internal_ip: 10.23.1.29
   pve_docker:
-    ip: 192.168.2.47
+    ip: 10.23.1.7
-    internal_ip: 10.23.1.7
   homeassistant:
     ip: 192.168.2.41
   forrest:
-    internal_ip: 10.23.1.99
+    ip: 10.23.1.99
   deluge:
-    internal_ip: 10.23.1.52
+    ip: 10.23.1.52
   pve:
-    internal_ip: 10.23.1.1
+    ip: 10.23.1.1
-    ip: 192.168.2.200
+    external_ip: 192.168.2.200

ansible/host_vars/forrest.yml

@@ -1 +1 @@
-protected_ip: "{{ pve_hosts.forrest.internal_ip }}"
+private_ip: "{{ pve_hosts.forrest.ip }}"

ansible/host_vars/pve-docker.yml

@@ -1,5 +1,4 @@
 private_ip: "{{ pve_hosts.pve_docker.ip }}"
-protected_ip: "{{ pve_hosts.pve_docker.internal_ip }}"
 
 traefik_provider_jellyfin: true
 traefik_provider_homeassistant: true

ansible/host_vars/pve.yml

@@ -1,5 +1,4 @@
 private_ip: "{{ pve_hosts.pve.ip }}"
-protected_ip: "{{ pve_hosts.pve.internal_ip }}"
 
 zpools_to_scrub:
   - tank

ansible/roles/duplicati/files/docker-compose.yml

@@ -13,4 +13,4 @@ services:
       - /:/source:ro
     restart: unless-stopped
     ports:
-      - "{{ protected_ip }}:8200:8200"
+      - "{{ private_ip }}:8200:8200"

ansible/roles/forrest/files/grafana/docker-compose.yml

@@ -24,7 +24,7 @@ services:
       - grafana
     restart: unless-stopped
     ports:
-      - "{{ protected_ip }}:3000:3000"
+      - "{{ private_ip }}:3000:3000"
     depends_on:
       - db
       - renderer

ansible/roles/forrest/files/influxdb/docker-compose.yml

@@ -22,7 +22,7 @@ services:
     volumes:
       - ./chronograf:/var/lib/chronograf
     ports:
-      - "{{ protected_ip }}:8888:8888"
+      - "{{ private_ip }}:8888:8888"
 
 networks:
   grafana:

ansible/roles/forrest/files/prometheus/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - prometheus
       - grafana
     ports:
-      - "{{ protected_ip }}:9090:9090"
+      - "{{ private_ip }}:9090:9090"
 
 networks:
   prometheus:

ansible/roles/pve_nebula_route/tasks/main.yml

@@ -17,6 +17,6 @@
       - add
       - "{{ nebula.cidr }}"
       - via
-      - "{{ pve_hosts.ingress.internal_ip }}"
+      - "{{ pve_hosts.ingress.ip }}"
   become: true
   when: nebula.cidr not in routes.stdout

ansible/roles/telegraf/files/telegraf.conf

@@ -85,7 +85,7 @@
 ###############################################################################
 
 [[outputs.prometheus_client]]
-  listen = "{{ protected_ip }}:9273"
+  listen = "{{ private_ip }}:9273"
   metric_version = 2
 
 ###############################################################################

ansible/roles/traefik/files/file-provider-grafana.yml

@@ -9,4 +9,4 @@ http:
     service-grafana:
       loadBalancer:
         servers:
-          - url: http://{{ pve_hosts.forrest.internal_ip }}:3000
+          - url: http://{{ pve_hosts.forrest.ip }}:3000

ansible/roles/traefik/files/file-provider-jellyfin.yml

@@ -9,4 +9,4 @@ http:
     service-jellyfin:
       loadBalancer:
         servers:
-          - url: http://{{ pve_hosts.jellyfin.internal_ip }}:8096
+          - url: http://{{ pve_hosts.jellyfin.ip }}:8096