3 files changed, 25 insertions, 34 deletions

diff --git a/ansible/group_vars/all/ipam.yml b/ansible/group_vars/all/ipam.yml
index d83de64..f0ce96c 100644
--- a/ansible/group_vars/all/ipam.yml
+++ b/ansible/group_vars/all/ipam.yml
@@ -25,12 +25,6 @@ ipam6:
       range: "fdb1:4242:3538:2004::/64"
       hosts:
         knot: "fdb1:4242:3538:2004::ffff"
-    coregonus_dn42:
-      range: "fdb1:4242:3538:2005::/64"
-      hosts:
-        kjell: "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c/64"
-    coregonus_docker:
-      range: "fdb1:4242:3538:2005:df01:676a:ec28:0a00/120"
     kv24_pub:
       range: "2a01:799:111d:1801::/64"
     kv24_dn42:
@@ -40,7 +34,7 @@ ipam6:
         garasjepi: "fdb1:4242:3538:2006:e9f7:418f:49fd:8d2e"
         ha-kv24: "fdb1:4242:3538:2006:18a:90f:4264:8ca0/64"
         netbox: "fdb1:4242:3538:2006:be24:11ff:febb:5c7f/64"
-        coregonus: "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5/64"
+        kjell: "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c/64"
     hash_dn42:
       range: "fdb1:4242:3538:2007::/64"
       hosts:
@@ -57,6 +51,10 @@ ipam6:
         conflatorio: "fdb1:4242:3538:2008:8042:32ff:fe0c:7161"
         danneri: "fdb1:4242:3538:2008:9422:d355:95b7:f170"
         unifi: "fdb1:4242:3538:2008:5054:ff:fe4d:96c"
+    lhn2_service:
+      range: "fdb1:4242:3538:2009::/64"
+      hosts:
+        coregonus: "fdb1:4242:3538:2009::4/64"
 
 #    k8s:
 #      range: "fdb1:4242:3538:3000::/52"
diff --git a/terraform/dns/dn42.tf b/terraform/dns/dn42.tf
index 12354b7..e23af28 100644
--- a/terraform/dns/dn42.tf
+++ b/terraform/dns/dn42.tf
@@ -11,7 +11,7 @@ resource "linode_domain_record" "dn42-coregonus" {
   domain_id   = linode_domain.root.id
   name        = "coregonus.dn42"
   record_type = "AAAA"
-  target      = "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+  target      = "fdb1:4242:3538:2009::4"
 }
 
 resource "linode_domain_record" "dn42-danneri" {
diff --git a/terraform/ipam6/ipam6.tf b/terraform/ipam6/ipam6.tf
index e4cf15e..84c7a87 100644
--- a/terraform/ipam6/ipam6.tf
+++ b/terraform/ipam6/ipam6.tf
@@ -54,24 +54,6 @@ output "networks" {
         }
       }
     }
-    coregonus_dn42 = {
-      range   = "fdb1:4242:3538:2005::/64"
-      address = "fdb1:4242:3538:2005::"
-      prefix  = "64"
-      hosts = {
-        kjell = {
-          address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
-          prefix : "64"
-        }
-      }
-    }
-    coregonus_docker = {
-      range   = "fdb1:4242:3538:2005:df01:676a:ec28:0a00/120"
-      address = "fdb1:4242:3538:2005:df01:676a:ec28:a00"
-      prefix  = "120"
-      hosts = {
-      }
-    }
     kv24_pub = {
       range   = "2a01:799:111d:1801::/64"
       address = "2a01:799:111d:1801::"
@@ -100,8 +82,8 @@ output "networks" {
           address : "fdb1:4242:3538:2006:be24:11ff:febb:5c7f"
           prefix : "64"
         }
-        coregonus = {
-          address : "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+        kjell = {
+          address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
           prefix : "64"
         }
       }
@@ -159,6 +141,17 @@ output "networks" {
         }
       }
     }
+    lhn2_service = {
+      range   = "fdb1:4242:3538:2009::/64"
+      address = "fdb1:4242:3538:2009::"
+      prefix  = "64"
+      hosts = {
+        coregonus = {
+          address : "fdb1:4242:3538:2009::4"
+          prefix : "64"
+        }
+      }
+    }
     danneri_cluster = {
       range   = "fdb1:4242:3538:2008:aaaa:aaaa:aaaa::/112"
       address = "fdb1:4242:3538:2008:aaaa:aaaa:aaaa:0"
@@ -197,10 +190,6 @@ output "hosts" {
       address : "fdb1:4242:3538:2004::ffff"
       prefix : "128"
     }
-    kjell = {
-      address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
-      prefix : "64"
-    }
     kv24ix = {
       address : "fdb1:4242:3538:2006::ffff"
       prefix : "128"
@@ -217,8 +206,8 @@ output "hosts" {
       address : "fdb1:4242:3538:2006:be24:11ff:febb:5c7f"
       prefix : "64"
     }
-    coregonus = {
-      address : "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+    kjell = {
+      address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
       prefix : "64"
     }
     hash = {
@@ -253,5 +242,9 @@ output "hosts" {
       address : "fdb1:4242:3538:2008:5054:ff:fe4d:96c"
       prefix : "128"
     }
+    coregonus = {
+      address : "fdb1:4242:3538:2009::4"
+      prefix : "64"
+    }
   }
 }