WIP: ipam-data #835

Draft

ecoppens wants to merge 66 commits from ipam-data into faiv2

pull from: ipam-data

merge into: DGNum:faiv2

DGNum:main

DGNum:hypervisor-incus

DGNum:faiv2

DGNum:temp/hypervisor-tests

DGNum:zulipcas

DGNum:storage01-root-elias

DGNum:lon/wp4nix

DGNum:lon/proxmox-nixos

DGNum:lon/poleSubscribe

DGNum:lon/nixos-unstable

DGNum:lon/nixos-26.05

DGNum:lon/nixos-25.11

DGNum:lon/nix-zulip

DGNum:lon/lon

DGNum:lon/lix-module

DGNum:lon/lix-diff

DGNum:lon/lix

DGNum:lon/git-hooks

DGNum:lon/dns.nix

DGNum:lon/dgsi

DGNum:lon/colmena

DGNum:traque

DGNum:fai_tomerge

DGNum:pole

DGNum:bump_nixos_26_05

DGNum:faiv2-radius

DGNum:elias/leave-bureau

DGNum:net_lib_doc

DGNum:kahulm_dns

DGNum:fai

DGNum:c3nav

DGNum:grist_update

DGNum:feat/dns-01

DGNum:pav01-move

DGNum:metis-main

DGNum:lixcon

DGNum:fix_grist_license

DGNum:update_nixos_2511

DGNum:grafana_role_mgmt

DGNum:build01_m_a

DGNum:ulogd_socket_buffer_maxsize

DGNum:pipe

DGNum:netgraph

DGNum:move_netbird

DGNum:reaction_ssh

DGNum:forgejo_io_accounting

DGNum:fix_wifi

DGNum:ielo

DGNum:grist

DGNum:hypervisor-linstor

DGNum:django-apps/versions-publish

DGNum:nixos-25.11

DGNum:isp/gretap

DGNum:meta/ipam

DGNum:peertube_max_size

DGNum:feat/listmonk

DGNum:ipam

DGNum:netcore_hyp

DGNum:bgp_test

DGNum:no-id-list

DGNum:jdl-site

DGNum:gretap

DGNum:lon/liminix

DGNum:external_upgrade

DGNum:takumiv2

DGNum:init_2511_pin

DGNum:automatic-updates

DGNum:disable_geo_bk

DGNum:external01

DGNum:zulip

DGNum:pkg-update

DGNum:test-Jaccess01

DGNum:geo01-no-notify

DGNum:alert-manager-notify

DGNum:deploy_jdl

DGNum:jdl01

DGNum:drbd

DGNum:zulip_11_x

DGNum:labrouter-wg

DGNum:zulipmail

DGNum:feature/add-bmc-ips

DGNum:build01-journald

DGNum:mdebray/nixos-25.05

DGNum:declarative-buckets

DGNum:vault01-isp

DGNum:demarches01

DGNum:hackdays-ap

DGNum:raito/zulip

DGNum:staging-cas

DGNum:testing02

DGNum:ban_git_scrappers

DGNum:hypervisor

DGNum:victoria-metrics

DGNum:init-dgnum-page

DGNum:takumi-can-do-ollama

Conversation 0 Commits 66 Files changed 193 +10142 -5406

ecoppens commented 2026-08-30 15:35:32 +02:00

Owner

Copy link

No description provided.

ecoppens added 2 commits 2026-08-30 15:35:32 +02:00

fix(nodes/ap): fix IPv6 for MA14-15 d919736613

feat: set ENS jourdan public IPs and DGNum private IPs in IPAM b0d86918d8

ecoppens changed title from ipam-data to WIP: ipam-data 2026-08-30 15:35:40 +02:00

ecoppens force-pushed ipam-data from b0d86918d8 to 352e37e7ec 2026-08-30 15:56:37 +02:00 Compare

ecoppens force-pushed ipam-data from 352e37e7ec to 07296e75c8 2026-08-30 15:59:54 +02:00 Compare

ecoppens force-pushed ipam-data from 07296e75c8 to f971d4c0b9 2026-08-30 16:03:19 +02:00 Compare

ecoppens added 1 commit 2026-08-30 16:05:50 +02:00

fix(meta): fix apInfo requiring sshKey 7689ed623e

ecoppens added 1 commit 2026-08-30 17:20:57 +02:00

feat(meta): flatten module types to remove all "_type" elements d7c2292fd7

ecoppens force-pushed ipam-data from d7c2292fd7 to 85d092fc1b 2026-08-30 17:41:04 +02:00 Compare

ecoppens added 1 commit 2026-08-30 17:44:18 +02:00

feat(ipam): add legacy services IPs 3520427a8f

ecoppens added 1 commit 2026-08-30 22:26:43 +02:00

feat(ipam): add netbird IPs into IPAM and automatic assignement into network nodes 0e36ab2636

All checks were successful

Hide all checks

Check meta / check_meta (push) Successful in 10s

Details

Run pre-commit on all files / pre-commit (pull_request) Successful in 16s

Details

Run pre-commit on all files / pre-commit (push) Successful in 16s

Details

This pull request has changes conflicting with the target branch.

• REUSE.toml
• default.nix
• machines/netconf/MR-distribution.json
• machines/netconf/netcore02.nix
• machines/netconf/netcore03.nix
• machines/nixos/external01/secrets/knot-acme-keys
• machines/nixos/external01/secrets/knot-keys
• machines/nixos/vault01/backbone.nix
• machines/nixos/vault01/networking.nix
• machines/nixos/vault01/secrets/radius-ap-radius-secret_file
• machines/nixos/vault01/secrets/radius-tsig-key
• machines/nixos/vault01/secrets/systemd-network-tunnel_wg_key
• machines/nixos/vault02/networking.nix
• machines/nixos/vault02/secrets/radius-ap-radius-secret_file
• machines/nixos/vault02/secrets/radius-dgsi_token_file
• machines/nixos/vault02/secrets/radius-tsig-key
• machines/nixos/vault02/secrets/thurned-dgsi_token_file
• machines/nixos/vault03/secrets/radius-ap-radius-secret_file
• machines/nixos/vault03/secrets/radius-dgsi_token_file
• machines/nixos/vault03/secrets/radius-tsig-key
• machines/nixos/vault03/secrets/thurned-dgsi_token_file
• machines/nixos/vault99/isp.nix
• machines/nixos/vault99/secrets/radius-client-secret
• machines/nixos/vault99/secrets/radius-dgsi-token
• machines/nixos/vault99/secrets/radius-tsig-key
• machines/nixos/vault99/secrets/thurned-dgsi_token_file
• machines/nixos/vault99/secrets/tunnel-wg-key
• machines/openwrt/ap-prod/_configuration.nix
• meta/default.nix
• meta/ipam/default.nix
• meta/ipam/ip.nix
• meta/ipam/prefix.nix
• meta/isp/thurnes.json
• meta/lab-dns.nix
• meta/network.nix
• meta/nodes/aps.json
• meta/nodes/nixos.nix
• meta/nodes/openwrt.nix
• modules/nixos/dgn-isp/access/default.nix
• modules/nixos/dgn-isp/access/nginx.nix
• modules/nixos/dgn-isp/access/radius/default.nix
• modules/nixos/dgn-isp/access/thurned.nix
• modules/nixos/dgn-isp/host/monitoring/default.nix
• modules/nixos/dgn-isp/tunnel.nix
• patches/default.nix
• pkgs/python-pkgs/dgn-radius/src/dgn_radius.py

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'WIP: ipam-data' (#835) from ipam-data into faiv2

Merge commit body Reviewed-on: https://git.dgnum.eu/DGNum/infrastructure/pulls/835

Merge pull request 'WIP: ipam-data' (#835) from ipam-data into faiv2 Reviewed-on: https://git.dgnum.eu/DGNum/infrastructure/pulls/835 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin ipam-data:ipam-data

git switch ipam-data

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch faiv2

git merge --no-ff ipam-data

git switch ipam-data

git rebase faiv2

git switch faiv2

git merge --ff-only ipam-data

git switch ipam-data

git rebase faiv2

git switch faiv2

git merge --no-ff ipam-data

git switch faiv2

git merge --squash ipam-data

git switch faiv2

git merge --ff-only ipam-data

git switch faiv2

git merge ipam-data

git push origin faiv2

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

awaiting

awaiting-author

Awaiting for the author interaction (e.g. QA/confirmation/final merge)

  

awaiting

awaiting-reviewer

Awaiting for a privileged reviewer to approve this PR

  

bot

Pull Request opened by a bot

  

deployed

This PR is currently deployed on the infra

  

Silenced alert

This is a known and silenced alert.

  

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

awaiting

awaiting-author

awaiting

awaiting-reviewer

bot

deployed

Silenced alert

bug

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

DGNum/infrastructure!835

No description provided.