Remove separate private and protected IP

This commit is contained in:
Jake Howard 2021-03-27 18:42:06 +00:00
parent 7580c0fd59
commit 1d997d3c33
Signed by: jake
GPG key ID: 57AFB45680EDD477
13 changed files with 16 additions and 22 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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