aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/group_vars/all/ipam.yml2
-rw-r--r--terraform/dns/dn42.tf8
-rw-r--r--terraform/ipam6/ipam6.tf36
3 files changed, 23 insertions, 23 deletions
diff --git a/ansible/group_vars/all/ipam.yml b/ansible/group_vars/all/ipam.yml
index aa9da27..27c40be 100644
--- a/ansible/group_vars/all/ipam.yml
+++ b/ansible/group_vars/all/ipam.yml
@@ -27,7 +27,7 @@ ipam6:
coregonus_dn42:
range: "fdb1:4242:3538:2005::/64"
hosts:
- coregonus-ix: "fdb1:4242:3538:2005::ffff"
+ coregonus: "fdb1:4242:3538:2005::ffff"
coregonus_docker:
range: "fdb1:4242:3538:2005:df01:676a:ec28:0a00/120"
kv24_dn42:
diff --git a/terraform/dns/dn42.tf b/terraform/dns/dn42.tf
index 857b165..9363b60 100644
--- a/terraform/dns/dn42.tf
+++ b/terraform/dns/dn42.tf
@@ -7,9 +7,9 @@ resource "linode_domain_record" "dn42-conflatorio" {
target = "fdb1:4242:3538:2008:8042:32ff:fe0c:7161"
}
-resource "linode_domain_record" "dn42-coregonus-ix" {
+resource "linode_domain_record" "dn42-coregonus" {
domain_id = linode_domain.root.id
- name = "coregonus-ix.dn42"
+ name = "coregonus.dn42"
record_type = "AAAA"
target = "fdb1:4242:3538:2005::ffff"
}
@@ -53,12 +53,12 @@ resource "linode_domain_record" "dn42-node1" {
domain_id = linode_domain.root.id
name = "node1.dn42"
record_type = "AAAA"
- target = "fdb1:4242:3538:2002::"
+ target = "fdb1:4242:3538:2002::ffff"
}
resource "linode_domain_record" "dn42-node2" {
domain_id = linode_domain.root.id
name = "node2.dn42"
record_type = "AAAA"
- target = "fdb1:4242:3538:2003::"
+ target = "fdb1:4242:3538:2003::ffff"
}
diff --git a/terraform/ipam6/ipam6.tf b/terraform/ipam6/ipam6.tf
index b6cb36f..62fd1d1 100644
--- a/terraform/ipam6/ipam6.tf
+++ b/terraform/ipam6/ipam6.tf
@@ -27,8 +27,8 @@ output "networks" {
prefix = "64"
hosts = {
node1 = {
- address : "fdb1:4242:3538:2002::"
- prefix : "64"
+ address : "fdb1:4242:3538:2002::ffff"
+ prefix : "128"
}
}
}
@@ -38,8 +38,8 @@ output "networks" {
prefix = "64"
hosts = {
node2 = {
- address : "fdb1:4242:3538:2003::"
- prefix : "64"
+ address : "fdb1:4242:3538:2003::ffff"
+ prefix : "128"
}
}
}
@@ -50,7 +50,7 @@ output "networks" {
hosts = {
knot = {
address : "fdb1:4242:3538:2004::ffff"
- prefix : "64"
+ prefix : "128"
}
}
}
@@ -59,9 +59,9 @@ output "networks" {
address = "fdb1:4242:3538:2005::"
prefix = "64"
hosts = {
- coregonus-ix = {
+ coregonus = {
address : "fdb1:4242:3538:2005::ffff"
- prefix : "64"
+ prefix : "128"
}
}
}
@@ -79,7 +79,7 @@ output "networks" {
hosts = {
kv24ix = {
address : "fdb1:4242:3538:2006::ffff"
- prefix : "64"
+ prefix : "128"
}
}
}
@@ -108,7 +108,7 @@ output "networks" {
hosts = {
lhn2pi = {
address : "fdb1:4242:3538:2008::ffff"
- prefix : "64"
+ prefix : "128"
}
conflatorio = {
address : "fdb1:4242:3538:2008:8042:32ff:fe0c:7161"
@@ -133,24 +133,24 @@ output "networks" {
output "hosts" {
value = {
node1 = {
- address : "fdb1:4242:3538:2002::"
- prefix : "64"
+ address : "fdb1:4242:3538:2002::ffff"
+ prefix : "128"
}
node2 = {
- address : "fdb1:4242:3538:2003::"
- prefix : "64"
+ address : "fdb1:4242:3538:2003::ffff"
+ prefix : "128"
}
knot = {
address : "fdb1:4242:3538:2004::ffff"
- prefix : "64"
+ prefix : "128"
}
- coregonus-ix = {
+ coregonus = {
address : "fdb1:4242:3538:2005::ffff"
- prefix : "64"
+ prefix : "128"
}
kv24ix = {
address : "fdb1:4242:3538:2006::ffff"
- prefix : "64"
+ prefix : "128"
}
hash = {
address : "fdb1:4242:3538:2007::ffff"
@@ -158,7 +158,7 @@ output "hosts" {
}
lhn2pi = {
address : "fdb1:4242:3538:2008::ffff"
- prefix : "64"
+ prefix : "128"
}
conflatorio = {
address : "fdb1:4242:3538:2008:8042:32ff:fe0c:7161"