From f1f2c620b0cf5bd47b98fb47fec345eab1d67ae9 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Thu, 3 Jun 2021 20:47:08 +0100
Subject: [PATCH] Replace DHCP on PVE for static IPs

So much easier to deal with!
---
 ansible/group_vars/all/pve.yml                | 30 ++++++++++---------
 .../forrest/files/prometheus/prometheus.yml   |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ansible/group_vars/all/pve.yml b/ansible/group_vars/all/pve.yml
index 05fcffe..f7cf6bd 100644
--- a/ansible/group_vars/all/pve.yml
+++ b/ansible/group_vars/all/pve.yml
@@ -1,21 +1,23 @@
 pve_hosts:
   internal_cidr: 10.23.1.0/24
-  ingress:
-    ip: 10.23.1.88
-  jellyfin:
-    ip: 10.23.1.29
-  pve_docker:
-    ip: 10.23.1.7
-  homeassistant:
-    ip: 192.168.1.132
-  forrest:
-    ip: 10.23.1.99
   pve:
     ip: 10.23.1.1
     external_ip: 192.168.2.200
-  qbittorrent:
-    ip: 10.23.1.21
+  restic:
+    ip: 10.23.1.11
+  forrest:
+    ip: 10.23.1.13
+  jellyfin:
+    ip: 10.23.1.101
+  pve_docker:
+    ip: 10.23.1.103
   gitlab:
-    ip: 10.23.1.43
+    ip: 10.23.1.106
   gitlab_runner:
-    ip: 10.23.1.48
+    ip: 10.23.1.107
+  ingress:
+    ip: 10.23.1.10
+  homeassistant:
+    ip: 192.168.2.203
+  qbittorrent:
+    ip: 10.23.1.105
diff --git a/ansible/roles/forrest/files/prometheus/prometheus.yml b/ansible/roles/forrest/files/prometheus/prometheus.yml
index 6dfb858..2406a46 100644
--- a/ansible/roles/forrest/files/prometheus/prometheus.yml
+++ b/ansible/roles/forrest/files/prometheus/prometheus.yml
@@ -7,7 +7,7 @@ scrape_configs:
 
     static_configs:
       - targets:
-          - 10.23.1.1:9273
+          - "{{ pve_hosts.pve.ip }}:9273"
   - job_name: traefik
     metric_relabel_configs:
       - source_labels: [__name__]