aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2024-11-12 21:49:34 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2024-11-12 21:49:40 +0100
commite69f40d39da728ec7589a244b3749559bfc3db1e (patch)
treec1e9b1dfdca1e4e1ac18cef97ca0808d6f8e9092
parent314f9bbaf49ad17cb6d418e4b7577a03c6024de6 (diff)
downloadinfra-e69f40d39da728ec7589a244b3749559bfc3db1e.tar.gz
infra-e69f40d39da728ec7589a244b3749559bfc3db1e.tar.bz2
infra-e69f40d39da728ec7589a244b3749559bfc3db1e.tar.xz
infra-e69f40d39da728ec7589a244b3749559bfc3db1e.zip
ipam
-rw-r--r--ansible/group_vars/all/ipam.yml20
-rw-r--r--ansible/plays/ipam-generate-dns.yml2
-rw-r--r--ansible/plays/ipam-generate-tf.yml2
-rw-r--r--terraform/dns/dn42.tf7
-rw-r--r--terraform/ipam6/ipam6.tf15
5 files changed, 38 insertions, 8 deletions
diff --git a/ansible/group_vars/all/ipam.yml b/ansible/group_vars/all/ipam.yml
index 54fc444..4948235 100644
--- a/ansible/group_vars/all/ipam.yml
+++ b/ansible/group_vars/all/ipam.yml
@@ -31,6 +31,10 @@ ipam6:
coregonus: "fdb1:4242:3538:2005::ffff"
coregonus_docker:
range: "fdb1:4242:3538:2005:df01:676a:ec28:0a00/120"
+ kv24_pub:
+ range: "2a01:799:111d:1801::/64"
+ hosts:
+ homeassistant: "2a01:799:111d:1801:e0d7:757e:4080:a508/64"
kv24_dn42:
range: "fdb1:4242:3538:2006::/64"
hosts:
@@ -49,14 +53,14 @@ ipam6:
danneri: "fdb1:4242:3538:2008:9422:d355:95b7:f170"
unifi: "fdb1:4242:3538:2008:5054:ff:fe4d:96c"
- k8s:
- range: "fdb1:4242:3538:3000::/52"
- danneri_cluster:
- range: "fdb1:4242:3538:3009::/112"
- danneri_service:
- range: "fdb1:4242:3538:300a::/100"
- danneri_service2:
- range: "fdb1:4242:3538:300a::/112"
+# k8s:
+# range: "fdb1:4242:3538:3000::/52"
+# danneri_cluster:
+# range: "fdb1:4242:3538:3009::/112"
+# danneri_service:
+# range: "fdb1:4242:3538:300a::/100"
+# danneri_service2:
+# range: "fdb1:4242:3538:300a::/112"
dn42:
range: "fd00::/8"
diff --git a/ansible/plays/ipam-generate-dns.yml b/ansible/plays/ipam-generate-dns.yml
index d29b3e8..25f8087 100644
--- a/ansible/plays/ipam-generate-dns.yml
+++ b/ansible/plays/ipam-generate-dns.yml
@@ -1,6 +1,8 @@
- hosts: localhost
gather_facts: no
connection: local
+ vars_files:
+ - ../group_vars/all/ipam.yml
tasks:
- set_fact:
content: |
diff --git a/ansible/plays/ipam-generate-tf.yml b/ansible/plays/ipam-generate-tf.yml
index 209b8ab..d9888b4 100644
--- a/ansible/plays/ipam-generate-tf.yml
+++ b/ansible/plays/ipam-generate-tf.yml
@@ -1,6 +1,8 @@
- hosts: localhost
gather_facts: no
connection: local
+ vars_files:
+ - ../group_vars/all/ipam.yml
collections:
- ansible.utils
tasks:
diff --git a/terraform/dns/dn42.tf b/terraform/dns/dn42.tf
index 35bc26e..5e39c97 100644
--- a/terraform/dns/dn42.tf
+++ b/terraform/dns/dn42.tf
@@ -28,6 +28,13 @@ resource "linode_domain_record" "dn42-hash" {
target = "fdb1:4242:3538:2007::ffff"
}
+resource "linode_domain_record" "dn42-homeassistant" {
+ domain_id = linode_domain.root.id
+ name = "homeassistant.dn42"
+ record_type = "AAAA"
+ target = "2a01:799:111d:1801:e0d7:757e:4080:a508"
+}
+
resource "linode_domain_record" "dn42-knot" {
domain_id = linode_domain.root.id
name = "knot.dn42"
diff --git a/terraform/ipam6/ipam6.tf b/terraform/ipam6/ipam6.tf
index 0cdd754..a077e98 100644
--- a/terraform/ipam6/ipam6.tf
+++ b/terraform/ipam6/ipam6.tf
@@ -72,6 +72,17 @@ output "networks" {
hosts = {
}
}
+ kv24_pub = {
+ range = "2a01:799:111d:1801::/64"
+ address = "2a01:799:111d:1801::"
+ prefix = "64"
+ hosts = {
+ homeassistant = {
+ address : "2a01:799:111d:1801:e0d7:757e:4080:a508"
+ prefix : "128"
+ }
+ }
+ }
kv24_dn42 = {
range = "fdb1:4242:3538:2006::/64"
address = "fdb1:4242:3538:2006::"
@@ -180,6 +191,10 @@ output "hosts" {
address : "fdb1:4242:3538:2005::ffff"
prefix : "128"
}
+ homeassistant = {
+ address : "2a01:799:111d:1801:e0d7:757e:4080:a508"
+ prefix : "128"
+ }
kv24ix = {
address : "fdb1:4242:3538:2006::ffff"
prefix : "128"