Dropping coregonus v6 network

4 files changed, 42 insertions, 39 deletions

diff --git a/ansible/group_vars/all/ipam.yml b/ansible/group_vars/all/ipam.yml
index 9a8efd6..5621385 100644
--- a/ansible/group_vars/all/ipam.yml
+++ b/ansible/group_vars/all/ipam.yml
@@ -28,20 +28,19 @@ ipam6:
     coregonus_dn42:
       range: "fdb1:4242:3538:2005::/64"
       hosts:
-        coregonus: "fdb1:4242:3538:2005::ffff"
-        kjell: "fdb1:4242:3538:2005:2f0:cbff:fefe:d98c/64"
+        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"
-      hosts:
-        ha-kv24: "fdb1:4242:3538:2005:c534:9d54:8212:1ced/64"
-        netbox: "fdb1:4242:3538:2005:be24:11ff:febb:5c7f/64"
     kv24_dn42:
       range: "fdb1:4242:3538:2006::/64"
       hosts:
         kv24ix: "fdb1:4242:3538:2006::ffff"
-        garasjepi: "fdb1:4242:3538:2005:37df:fafe:392:f991"
+        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"
     hash_dn42:
       range: "fdb1:4242:3538:2007::/64"
       hosts:
diff --git a/ansible/inventory b/ansible/inventory
index 1684d93..912b922 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -59,6 +59,10 @@ all:
     zh2569.rsync.net:
       ansible_user: zh2569
 
+    # Kjell
+    kjell-ct-102:
+      ansible_host: fdb1:4242:3538:2005:be24:11ff:fe34:b52c
+
   children:
     workstation:
       children:
diff --git a/terraform/dns/dn42.tf b/terraform/dns/dn42.tf
index 8c27ec1..c7aab96 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:2005::ffff"
+  target      = "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
 }
 
 resource "linode_domain_record" "dn42-danneri" {
@@ -25,14 +25,14 @@ resource "linode_domain_record" "dn42-garasjepi" {
   domain_id   = linode_domain.root.id
   name        = "garasjepi.dn42"
   record_type = "AAAA"
-  target      = "fdb1:4242:3538:2005:37df:fafe:392:f991"
+  target      = "fdb1:4242:3538:2006:e9f7:418f:49fd:8d2e"
 }
 
 resource "linode_domain_record" "dn42-ha-kv24" {
   domain_id   = linode_domain.root.id
   name        = "ha-kv24.dn42"
   record_type = "AAAA"
-  target      = "fdb1:4242:3538:2005:c534:9d54:8212:1ced"
+  target      = "fdb1:4242:3538:2006:18a:90f:4264:8ca0"
 }
 
 resource "linode_domain_record" "dn42-ha-lhn2" {
@@ -53,7 +53,7 @@ resource "linode_domain_record" "dn42-kjell" {
   domain_id   = linode_domain.root.id
   name        = "kjell.dn42"
   record_type = "AAAA"
-  target      = "fdb1:4242:3538:2005:2f0:cbff:fefe:d98c"
+  target      = "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
 }
 
 resource "linode_domain_record" "dn42-knot" {
@@ -88,7 +88,7 @@ resource "linode_domain_record" "dn42-netbox" {
   domain_id   = linode_domain.root.id
   name        = "netbox.dn42"
   record_type = "AAAA"
-  target      = "fdb1:4242:3538:2005:be24:11ff:febb:5c7f"
+  target      = "fdb1:4242:3538:2006:be24:11ff:febb:5c7f"
 }
 
 resource "linode_domain_record" "dn42-node1" {
diff --git a/terraform/ipam6/ipam6.tf b/terraform/ipam6/ipam6.tf
index 355ff4b..08ad9a0 100644
--- a/terraform/ipam6/ipam6.tf
+++ b/terraform/ipam6/ipam6.tf
@@ -59,12 +59,8 @@ output "networks" {
       address = "fdb1:4242:3538:2005::"
       prefix  = "64"
       hosts = {
-        coregonus = {
-          address : "fdb1:4242:3538:2005::ffff"
-          prefix : "128"
-        }
         kjell = {
-          address : "fdb1:4242:3538:2005:2f0:cbff:fefe:d98c"
+          address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
           prefix : "64"
         }
       }
@@ -81,14 +77,6 @@ output "networks" {
       address = "2a01:799:111d:1801::"
       prefix  = "64"
       hosts = {
-        ha-kv24 = {
-          address : "fdb1:4242:3538:2005:c534:9d54:8212:1ced"
-          prefix : "64"
-        }
-        netbox = {
-          address : "fdb1:4242:3538:2005:be24:11ff:febb:5c7f"
-          prefix : "64"
-        }
       }
     }
     kv24_dn42 = {
@@ -101,9 +89,21 @@ output "networks" {
           prefix : "128"
         }
         garasjepi = {
-          address : "fdb1:4242:3538:2005:37df:fafe:392:f991"
+          address : "fdb1:4242:3538:2006:e9f7:418f:49fd:8d2e"
           prefix : "128"
         }
+        ha-kv24 = {
+          address : "fdb1:4242:3538:2006:18a:90f:4264:8ca0"
+          prefix : "64"
+        }
+        netbox = {
+          address : "fdb1:4242:3538:2006:be24:11ff:febb:5c7f"
+          prefix : "64"
+        }
+        coregonus = {
+          address : "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+          prefix : "64"
+        }
       }
     }
     hash_dn42 = {
@@ -193,20 +193,8 @@ output "hosts" {
       address : "fdb1:4242:3538:2004::ffff"
       prefix : "128"
     }
-    coregonus = {
-      address : "fdb1:4242:3538:2005::ffff"
-      prefix : "128"
-    }
     kjell = {
-      address : "fdb1:4242:3538:2005:2f0:cbff:fefe:d98c"
-      prefix : "64"
-    }
-    ha-kv24 = {
-      address : "fdb1:4242:3538:2005:c534:9d54:8212:1ced"
-      prefix : "64"
-    }
-    netbox = {
-      address : "fdb1:4242:3538:2005:be24:11ff:febb:5c7f"
+      address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
       prefix : "64"
     }
     kv24ix = {
@@ -214,9 +202,21 @@ output "hosts" {
       prefix : "128"
     }
     garasjepi = {
-      address : "fdb1:4242:3538:2005:37df:fafe:392:f991"
+      address : "fdb1:4242:3538:2006:e9f7:418f:49fd:8d2e"
       prefix : "128"
     }
+    ha-kv24 = {
+      address : "fdb1:4242:3538:2006:18a:90f:4264:8ca0"
+      prefix : "64"
+    }
+    netbox = {
+      address : "fdb1:4242:3538:2006:be24:11ff:febb:5c7f"
+      prefix : "64"
+    }
+    coregonus = {
+      address : "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+      prefix : "64"
+    }
     hash = {
       address : "fdb1:4242:3538:2007::ffff"
       prefix : "128"