From 3f4bcf4f04ade503f9430f6dd3882bae4b23c1ad Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Sat, 6 May 2023 11:11:25 +0000 Subject: [PATCH] Add two new host-types: 'host' and 'tap', which will serve as North/South debian hosts, and an OVS mirror host respectively --- .../default/hvn0.lab.ipng.ch/host0-0/etc/hostname | 1 + build/default/hvn0.lab.ipng.ch/host0-0/etc/hosts | 7 +++++++ .../host0-0/etc/netns/dataplane/resolv.conf | 4 ++++ .../host0-0/etc/netplan/01-netcfg.yaml | 15 +++++++++++++++ .../hvn0.lab.ipng.ch/host0-0/etc/resolv.conf | 4 ++++ .../host0-0/home/ipng/.ssh/authorized_keys | 9 +++++++++ .../host0-0/root/.ssh/authorized_keys | 9 +++++++++ .../default/hvn0.lab.ipng.ch/host0-1/etc/hostname | 1 + build/default/hvn0.lab.ipng.ch/host0-1/etc/hosts | 7 +++++++ .../host0-1/etc/netns/dataplane/resolv.conf | 4 ++++ .../host0-1/etc/netplan/01-netcfg.yaml | 15 +++++++++++++++ .../hvn0.lab.ipng.ch/host0-1/etc/resolv.conf | 4 ++++ .../host0-1/home/ipng/.ssh/authorized_keys | 9 +++++++++ .../host0-1/root/.ssh/authorized_keys | 9 +++++++++ .../default/hvn0.lab.ipng.ch/tap0-0/etc/hostname | 1 + build/default/hvn0.lab.ipng.ch/tap0-0/etc/hosts | 7 +++++++ .../tap0-0/etc/netns/dataplane/resolv.conf | 4 ++++ .../tap0-0/etc/netplan/01-netcfg.yaml | 15 +++++++++++++++ .../hvn0.lab.ipng.ch/tap0-0/etc/resolv.conf | 4 ++++ .../tap0-0/home/ipng/.ssh/authorized_keys | 9 +++++++++ .../tap0-0/root/.ssh/authorized_keys | 9 +++++++++ config/common/generic.yaml | 2 ++ generate | 12 +++++++----- 23 files changed, 156 insertions(+), 5 deletions(-) create mode 100644 build/default/hvn0.lab.ipng.ch/host0-0/etc/hostname create mode 100644 build/default/hvn0.lab.ipng.ch/host0-0/etc/hosts create mode 100644 build/default/hvn0.lab.ipng.ch/host0-0/etc/netns/dataplane/resolv.conf create mode 100644 build/default/hvn0.lab.ipng.ch/host0-0/etc/netplan/01-netcfg.yaml create mode 100644 build/default/hvn0.lab.ipng.ch/host0-0/etc/resolv.conf create mode 100644 build/default/hvn0.lab.ipng.ch/host0-0/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/host0-0/root/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/host0-1/etc/hostname create mode 100644 build/default/hvn0.lab.ipng.ch/host0-1/etc/hosts create mode 100644 build/default/hvn0.lab.ipng.ch/host0-1/etc/netns/dataplane/resolv.conf create mode 100644 build/default/hvn0.lab.ipng.ch/host0-1/etc/netplan/01-netcfg.yaml create mode 100644 build/default/hvn0.lab.ipng.ch/host0-1/etc/resolv.conf create mode 100644 build/default/hvn0.lab.ipng.ch/host0-1/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/host0-1/root/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/tap0-0/etc/hostname create mode 100644 build/default/hvn0.lab.ipng.ch/tap0-0/etc/hosts create mode 100644 build/default/hvn0.lab.ipng.ch/tap0-0/etc/netns/dataplane/resolv.conf create mode 100644 build/default/hvn0.lab.ipng.ch/tap0-0/etc/netplan/01-netcfg.yaml create mode 100644 build/default/hvn0.lab.ipng.ch/tap0-0/etc/resolv.conf create mode 100644 build/default/hvn0.lab.ipng.ch/tap0-0/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/tap0-0/root/.ssh/authorized_keys diff --git a/build/default/hvn0.lab.ipng.ch/host0-0/etc/hostname b/build/default/hvn0.lab.ipng.ch/host0-0/etc/hostname new file mode 100644 index 0000000..f5d1d7c --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-0/etc/hostname @@ -0,0 +1 @@ +host0-0 \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/host0-0/etc/hosts b/build/default/hvn0.lab.ipng.ch/host0-0/etc/hosts new file mode 100644 index 0000000..5095dd4 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-0/etc/hosts @@ -0,0 +1,7 @@ +127.0.0.1 localhost +127.0.1.1 host0-0.lab.ipng.ch host0-0 + +# The following lines are desirable for IPv6 capable hosts +::1 localhost ip6-localhost ip6-loopback +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/host0-0/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/host0-0/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..c57a7ba --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-0/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch net.ipng.ch ipng.ch +nameserver 192.168.10.4 +nameserver 2001:678:d78:201::ffff diff --git a/build/default/hvn0.lab.ipng.ch/host0-0/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/host0-0/etc/netplan/01-netcfg.yaml new file mode 100644 index 0000000..436ed73 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-0/etc/netplan/01-netcfg.yaml @@ -0,0 +1,15 @@ +network: + version: 2 + renderer: networkd + ethernets: + enp1s0: + optional: true + accept-ra: false + dhcp4: false + mtu: 9000 + addresses: [ 198.19.5.20/26, 2001:678:d78:50b::14/64 ] + routes: + - to: 0.0.0.0/0 + via: 198.19.5.1 + - to: ::/0 + via: 2001:678:d78:50b::1 diff --git a/build/default/hvn0.lab.ipng.ch/host0-0/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/host0-0/etc/resolv.conf new file mode 100644 index 0000000..6d35b25 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-0/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch net.ipng.ch ipng.ch +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn0.lab.ipng.ch/host0-0/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/host0-0/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..d3f3bc3 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-0/home/ipng/.ssh/authorized_keys @@ -0,0 +1,9 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= + +# Adrian's keys +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm diff --git a/build/default/hvn0.lab.ipng.ch/host0-0/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/host0-0/root/.ssh/authorized_keys new file mode 100644 index 0000000..d3f3bc3 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-0/root/.ssh/authorized_keys @@ -0,0 +1,9 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= + +# Adrian's keys +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm diff --git a/build/default/hvn0.lab.ipng.ch/host0-1/etc/hostname b/build/default/hvn0.lab.ipng.ch/host0-1/etc/hostname new file mode 100644 index 0000000..37eea49 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-1/etc/hostname @@ -0,0 +1 @@ +host0-1 \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/host0-1/etc/hosts b/build/default/hvn0.lab.ipng.ch/host0-1/etc/hosts new file mode 100644 index 0000000..28c9fcb --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-1/etc/hosts @@ -0,0 +1,7 @@ +127.0.0.1 localhost +127.0.1.1 host0-1.lab.ipng.ch host0-1 + +# The following lines are desirable for IPv6 capable hosts +::1 localhost ip6-localhost ip6-loopback +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/host0-1/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/host0-1/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..c57a7ba --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-1/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch net.ipng.ch ipng.ch +nameserver 192.168.10.4 +nameserver 2001:678:d78:201::ffff diff --git a/build/default/hvn0.lab.ipng.ch/host0-1/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/host0-1/etc/netplan/01-netcfg.yaml new file mode 100644 index 0000000..93b0e68 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-1/etc/netplan/01-netcfg.yaml @@ -0,0 +1,15 @@ +network: + version: 2 + renderer: networkd + ethernets: + enp1s0: + optional: true + accept-ra: false + dhcp4: false + mtu: 9000 + addresses: [ 198.19.5.21/26, 2001:678:d78:50b::15/64 ] + routes: + - to: 0.0.0.0/0 + via: 198.19.5.1 + - to: ::/0 + via: 2001:678:d78:50b::1 diff --git a/build/default/hvn0.lab.ipng.ch/host0-1/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/host0-1/etc/resolv.conf new file mode 100644 index 0000000..6d35b25 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-1/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch net.ipng.ch ipng.ch +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn0.lab.ipng.ch/host0-1/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/host0-1/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..d3f3bc3 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-1/home/ipng/.ssh/authorized_keys @@ -0,0 +1,9 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= + +# Adrian's keys +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm diff --git a/build/default/hvn0.lab.ipng.ch/host0-1/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/host0-1/root/.ssh/authorized_keys new file mode 100644 index 0000000..d3f3bc3 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/host0-1/root/.ssh/authorized_keys @@ -0,0 +1,9 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= + +# Adrian's keys +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm diff --git a/build/default/hvn0.lab.ipng.ch/tap0-0/etc/hostname b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/hostname new file mode 100644 index 0000000..78ad9c4 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/hostname @@ -0,0 +1 @@ +tap0-0 \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/tap0-0/etc/hosts b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/hosts new file mode 100644 index 0000000..8ae58d5 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/hosts @@ -0,0 +1,7 @@ +127.0.0.1 localhost +127.0.1.1 tap0-0.lab.ipng.ch tap0-0 + +# The following lines are desirable for IPv6 capable hosts +::1 localhost ip6-localhost ip6-loopback +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/tap0-0/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..c57a7ba --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch net.ipng.ch ipng.ch +nameserver 192.168.10.4 +nameserver 2001:678:d78:201::ffff diff --git a/build/default/hvn0.lab.ipng.ch/tap0-0/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/netplan/01-netcfg.yaml new file mode 100644 index 0000000..b7af9e9 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/netplan/01-netcfg.yaml @@ -0,0 +1,15 @@ +network: + version: 2 + renderer: networkd + ethernets: + enp1s0: + optional: true + accept-ra: false + dhcp4: false + mtu: 9000 + addresses: [ 198.19.5.22/26, 2001:678:d78:50b::16/64 ] + routes: + - to: 0.0.0.0/0 + via: 198.19.5.1 + - to: ::/0 + via: 2001:678:d78:50b::1 diff --git a/build/default/hvn0.lab.ipng.ch/tap0-0/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/resolv.conf new file mode 100644 index 0000000..6d35b25 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/tap0-0/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch net.ipng.ch ipng.ch +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn0.lab.ipng.ch/tap0-0/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/tap0-0/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..d3f3bc3 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/tap0-0/home/ipng/.ssh/authorized_keys @@ -0,0 +1,9 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= + +# Adrian's keys +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm diff --git a/build/default/hvn0.lab.ipng.ch/tap0-0/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/tap0-0/root/.ssh/authorized_keys new file mode 100644 index 0000000..d3f3bc3 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/tap0-0/root/.ssh/authorized_keys @@ -0,0 +1,9 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= + +# Adrian's keys +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm diff --git a/config/common/generic.yaml b/config/common/generic.yaml index f287a48..f9b2b4e 100644 --- a/config/common/generic.yaml +++ b/config/common/generic.yaml @@ -21,3 +21,5 @@ lab: search: [ "lab.ipng.ch", "net.ipng.ch", "ipng.ch" ] nodes: vpp: 4 + host: 2 + tap: 1 diff --git a/generate b/generate index 6030a47..091e449 100755 --- a/generate +++ b/generate @@ -151,8 +151,10 @@ def create_node(lab, node_id, node_type): lo4_base = lab["ipv4"].split("/")[0] lo6_base = lab["ipv6"].split("/")[0] total_nodes = 0 - for node_type, ncount in lab["nodes"].items(): - total_nodes += ncount + for nt, nc in lab["nodes"].items(): + if nt == node_type: + offset = total_nodes + total_nodes += nc ret = { "hostname": "%s%d-%d" % (node_type, lab["id"], node_id), @@ -160,12 +162,12 @@ def create_node(lab, node_id, node_type): "mgmt": { "ipv4": "%s/%s" % ( - ipaddress.IPv4Address(v4_base) + total_nodes * lab["id"] + node_id, + ipaddress.IPv4Address(v4_base) + total_nodes * lab["id"] + offset + node_id, v4_plen, ), "ipv6": "%s/%s" % ( - ipaddress.IPv6Address(v6_base) + total_nodes * lab["id"] + node_id, + ipaddress.IPv6Address(v6_base) + total_nodes * lab["id"] + offset + node_id, v6_plen, ), "gw4": lab["mgmt"]["gw4"], @@ -246,7 +248,7 @@ def main(): for node_type, ncount in data["lab"]["nodes"].items(): for node_id in range(ncount): - log.info("Generating for VPP node %d" % node_id) + log.info("Generating for %s node %d" % (node_type, node_id)) data["node"] = create_node(data["lab"], node_id, node_type) log.debug("node: %s" % data["node"])