{terraform,ansible}: Move hashi control plane to Finland

void-linux · Sep 27, 2024 · 73ed516 · 73ed516
1 parent 3db532c
commit 73ed516
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/ansible/group_vars/prod.yml b/ansible/group_vars/prod.yml
@@ -26,6 +26,6 @@ void_mesh:
   a-fra-de.m.voidlinux.org: 192.168.99.117
 
 consul_servers:
-  - 192.168.99.104
-  - 192.168.99.105
-  - 192.168.99.106
+  - 192.168.99.120
+  - 192.168.99.121
+  - 192.168.99.122
diff --git a/ansible/inventory b/ansible/inventory
@@ -15,6 +15,7 @@ a-fsn-de.m.voidlinux.org
 
 [netauth]
 a-sfo3-us.m.voidlinux.org
+i-hel-fi.m.voidlinux.org
 
 [netlogon]
 a-hel-fi.m.voidlinux.org
@@ -42,15 +43,16 @@ hashimirror
 hashimx
 
 [hashimaster]
-b-sfo3-us.m.voidlinux.org
-c-sfo3-us.m.voidlinux.org
-d-sfo3-us.m.voidlinux.org
+e-hel-fi.m.voidlinux.org
+f-hel-fi.m.voidlinux.org
+g-hel-fi.m.voidlinux.org
 
 [hashiworker]
 a-hel-fi.m.voidlinux.org
 a-fsn-de.m.voidlinux.org
 b-fsn-de.m.voidlinux.org
 b-lej-de.m.voidlinux.org
+h-hel-fi.m.voidlinux.org
 
 [hashimirror]
 b-hel-fi.m.voidlinux.org

diff --git a/terraform/do/dns.tf b/terraform/do/dns.tf
@@ -105,9 +105,9 @@ resource "digitalocean_record" "catchall_apex" {
 
 resource "digitalocean_record" "control_proxy" {
   for_each = toset([
-    digitalocean_record.b_sfo3_us.value,
-    digitalocean_record.c_sfo3_us.value,
-    digitalocean_record.d_sfo3_us.value,
+    digitalocean_record.e_hel_fi.value,
+    digitalocean_record.f_hel_fi.value,
+    digitalocean_record.g_hel_fi.value,
   ])
 
   domain = digitalocean_domain.voidlinux_org.name