ipam

4 files changed, 28 insertions, 35 deletions

diff --git a/ansible/group_vars/all/ipam.yml b/ansible/group_vars/all/ipam.yml
index 4948235..e025551 100644
--- a/ansible/group_vars/all/ipam.yml
+++ b/ansible/group_vars/all/ipam.yml
@@ -34,7 +34,7 @@ ipam6:
     kv24_pub:
       range: "2a01:799:111d:1801::/64"
       hosts:
-        homeassistant: "2a01:799:111d:1801:e0d7:757e:4080:a508/64"
+        ha-kv24: "fdb1:4242:3538:2005:c534:9d54:8212:1ced/64"
     kv24_dn42:
       range: "fdb1:4242:3538:2006::/64"
       hosts:
@@ -55,10 +55,10 @@ ipam6:
 
 #    k8s:
 #      range: "fdb1:4242:3538:3000::/52"
-#    danneri_cluster:
-#      range: "fdb1:4242:3538:3009::/112"
-#    danneri_service:
-#      range: "fdb1:4242:3538:300a::/100"
+    danneri_cluster:
+      range: "fdb1:4242:3538:2008:aaaa:aaaa:aaaa::/112"
+    danneri_service:
+      range: "fdb1:4242:3538:2008:bbbb:bbbb:bbbb::/112"
 #    danneri_service2:
 #      range: "fdb1:4242:3538:300a::/112"
 
diff --git a/terraform/dns/dn42.tf b/terraform/dns/dn42.tf
index 5e39c97..9f70413 100644
--- a/terraform/dns/dn42.tf
+++ b/terraform/dns/dn42.tf
@@ -21,18 +21,18 @@ resource "linode_domain_record" "dn42-danneri" {
   target      = "fdb1:4242:3538:2008:9422:d355:95b7:f170"
 }
 
-resource "linode_domain_record" "dn42-hash" {
+resource "linode_domain_record" "dn42-ha-kv24" {
   domain_id   = linode_domain.root.id
-  name        = "hash.dn42"
+  name        = "ha-kv24.dn42"
   record_type = "AAAA"
-  target      = "fdb1:4242:3538:2007::ffff"
+  target      = "fdb1:4242:3538:2005:c534:9d54:8212:1ced"
 }
 
-resource "linode_domain_record" "dn42-homeassistant" {
+resource "linode_domain_record" "dn42-hash" {
   domain_id   = linode_domain.root.id
-  name        = "homeassistant.dn42"
+  name        = "hash.dn42"
   record_type = "AAAA"
-  target      = "2a01:799:111d:1801:e0d7:757e:4080:a508"
+  target      = "fdb1:4242:3538:2007::ffff"
 }
 
 resource "linode_domain_record" "dn42-knot" {
diff --git a/terraform/dns/trygvis.tf b/terraform/dns/trygvis.tf
index 4dcec85..c3ffce0 100644
--- a/terraform/dns/trygvis.tf
+++ b/terraform/dns/trygvis.tf
@@ -158,6 +158,13 @@ resource "linode_domain_record" "unifi" {
   target      = "trygvis.io"
 }
 
+resource "linode_domain_record" "kv24" {
+  domain_id   = linode_domain.root.id
+  name        = "kv24"
+  record_type = "CNAME"
+  target      = "trygvis.io"
+}
+
 # Aliases for vs.trygvis.io
 resource "linode_domain_record" "nextcloud" {
   domain_id   = linode_domain.root.id
diff --git a/terraform/ipam6/ipam6.tf b/terraform/ipam6/ipam6.tf
index a077e98..4b7d494 100644
--- a/terraform/ipam6/ipam6.tf
+++ b/terraform/ipam6/ipam6.tf
@@ -77,9 +77,9 @@ output "networks" {
       address = "2a01:799:111d:1801::"
       prefix  = "64"
       hosts = {
-        homeassistant = {
-          address : "2a01:799:111d:1801:e0d7:757e:4080:a508"
-          prefix : "128"
+        ha-kv24 = {
+          address : "fdb1:4242:3538:2005:c534:9d54:8212:1ced"
+          prefix : "64"
         }
       }
     }
@@ -136,29 +136,15 @@ output "networks" {
       }
     }
     danneri_cluster = {
-      range   = "fdb1:4242:3538:3009::/112"
-      address = "fdb1:4242:3538:3009::"
+      range   = "fdb1:4242:3538:2008:aaaa:aaaa:aaaa::/112"
+      address = "fdb1:4242:3538:2008:aaaa:aaaa:aaaa:0"
       prefix  = "112"
       hosts = {
       }
     }
     danneri_service = {
-      range   = "fdb1:4242:3538:300a::/100"
-      address = "fdb1:4242:3538:300a::"
-      prefix  = "100"
-      hosts = {
-      }
-    }
-    k8s = {
-      range   = "fdb1:4242:3538:3000::/52"
-      address = "fdb1:4242:3538:3000::"
-      prefix  = "52"
-      hosts = {
-      }
-    }
-    danneri_service2 = {
-      range   = "fdb1:4242:3538:300a::/112"
-      address = "fdb1:4242:3538:300a::"
+      range   = "fdb1:4242:3538:2008:bbbb:bbbb:bbbb::/112"
+      address = "fdb1:4242:3538:2008:bbbb:bbbb:bbbb:0"
       prefix  = "112"
       hosts = {
       }
@@ -191,9 +177,9 @@ output "hosts" {
       address : "fdb1:4242:3538:2005::ffff"
       prefix : "128"
     }
-    homeassistant = {
-      address : "2a01:799:111d:1801:e0d7:757e:4080:a508"
-      prefix : "128"
+    ha-kv24 = {
+      address : "fdb1:4242:3538:2005:c534:9d54:8212:1ced"
+      prefix : "64"
     }
     kv24ix = {
       address : "fdb1:4242:3538:2006::ffff"