ipng/lab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Futher flesh out the generator

Browse Source 
- Create a per-host directory called overlays/$(overlay)/hostname/$(host.hostname) to have files that
  ought to be included only for that host. Things like /etc/vpp/config/interface.vpp go there
- Rename the "templates" directory as overlays/$(overlay)/common/
- Render one after the other, so a file can exist in common and hostname, the latter taking precedence
- Remove the config for 'pubkeys' and instead just make these common/root/.ssh/* and common/home/ipng/.ssh/*
- Split out bootstrap.vpp so that a per-host include can be overriden for interfaces.vpp
  - But keep a default common/etc/vpp/config/interface.vpp as a placeholder, so that VPP will still start
    even if the per-hostname override isn't provided.
- Generate a fresh output for 'default' on all machines
This commit is contained in:
Pim van Pelt
2022-10-18 16:27:18 +02:00
parent a665e3cbf0
commit 5bc0d2c84c
106 changed files with 614 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
overlays/bird/templates/etc/bird/bfd.conf.j2 → overlays/bird/common/etc/bird/bfd.conf.j2
View File

0
overlays/bird/templates/etc/bird/bird.conf.j2 → overlays/bird/common/etc/bird/bird.conf.j2
View File

0
overlays/bird/templates/etc/bird/ibgp.conf.j2 → overlays/bird/common/etc/bird/ibgp.conf.j2
View File

0
overlays/bird/templates/etc/bird/ospf.conf.j2 → overlays/bird/common/etc/bird/ospf.conf.j2
View File

0
overlays/bird/templates/etc/bird/static.conf.j2 → overlays/bird/common/etc/bird/static.conf.j2
View File

0
overlays/bird/templates/etc/hostname.j2 → overlays/bird/common/etc/hostname.j2
View File

0
overlays/bird/templates/etc/hosts.j2 → overlays/bird/common/etc/hosts.j2
View File

0
overlays/bird/templates/etc/netplan/01-netcfg.yaml.j2 → overlays/bird/common/etc/netplan/01-netcfg.yaml.j2
View File

8
overlays/bird/common/etc/vpp/bootstrap.vpp.j2 Normal file
View File

@ -0,0 +1,8 @@
comment { Apply system defaults from the build }
exec /etc/vpp/config/defaults.vpp
exec /etc/vpp/config/loopback.vpp
exec /etc/vpp/config/interface.vpp
exec /etc/vpp/config/lcp.vpp
comment { Allow user to set persistent manual configs }
exec /etc/vpp/config/manual.vpp

4
overlays/bird/common/etc/vpp/config/defaults.vpp Normal file
View File

@ -0,0 +1,4 @@
set logging class linux-cp rate-limit 1000 level warn syslog-level notice
lcp default netns dataplane
lcp lcp-sync on
lcp lcp-auto-subint off

1
overlays/bird/common/etc/vpp/config/interface.vpp.j2 Normal file
View File

@ -0,0 +1 @@
comment { This file is overridden by blobs/{{node.hostname}}/etc/vpp/config/interfaces.vpp }

6
overlays/bird/common/etc/vpp/config/lcp.vpp Normal file
View File

@ -0,0 +1,6 @@
comment { Create one LinuxCP Interface Pair for each phy }
lcp create loop0 host-if loop0
lcp create GigabitEthernet10/0/0 host-if e0
lcp create GigabitEthernet10/0/1 host-if e1
lcp create GigabitEthernet10/0/2 host-if e2
lcp create GigabitEthernet10/0/3 host-if e3

5
overlays/bird/common/etc/vpp/config/loopback.vpp.j2 Normal file
View File

@ -0,0 +1,5 @@
comment { Create a loopback interface }
create loopback interface instance 0
set interface state loop0 up
set interface ip address loop0 {{ node.loopback.ipv4 }}
set interface ip address loop0 {{ node.loopback.ipv6 }}

5
overlays/bird/common/home/ipng/.ssh/authorized_keys Normal file
View File

@ -0,0 +1,5 @@
# 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=

5
overlays/bird/common/root/.ssh/authorized_keys Normal file
View File

@ -0,0 +1,5 @@
# 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=

22
overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp Normal file
View File

@ -0,0 +1,22 @@
comment { Gi10/0/0 is connected to the IPng Networks lab uplink }
set interface mtu 9216 GigabitEthernet10/0/0
set interface mtu packet 1500 GigabitEthernet10/0/0
set interface address GigabitEthernet10/0/0 2001:678:d78:201::0:00/112
set interface state GigabitEthernet10/0/0 up
comment { Gi10/0/1 is connected to vpp0-1:Gi10/0/0 }
set interface mtu 9216 GigabitEthernet10/0/1
set interface mtu packet 9000 GigabitEthernet10/0/1
set interface address GigabitEthernet10/0/1 2001:678:d78:201::1:00/112
set interface address GigabitEthernet10/0/1 192.168.10.4/31
set interface state GigabitEthernet10/0/1 up
comment { Gi10/0/2 is free to use }
set interface mtu 9216 GigabitEthernet10/0/2
set interface mtu packet 9000 GigabitEthernet10/0/2
set interface state GigabitEthernet10/0/2 down
comment { Gi10/0/3 is free to use }
set interface mtu 9216 GigabitEthernet10/0/3
set interface mtu packet 9000 GigabitEthernet10/0/3
set interface state GigabitEthernet10/0/3 down

23
overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp Normal file
View File

@ -0,0 +1,23 @@
comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 }
set interface mtu 9216 GigabitEthernet10/0/0
set interface mtu packet 9000 GigabitEthernet10/0/0
set interface address GigabitEthernet10/0/0 2001:678:d78:201::1:01/112
set interface address GigabitEthernet10/0/0 192.168.10.5/31
set interface state GigabitEthernet10/0/0 up
comment { Gi10/0/1 is connected to vpp0-2:Gi10/0/0 }
set interface mtu 9216 GigabitEthernet10/0/1
set interface mtu packet 9000 GigabitEthernet10/0/1
set interface address GigabitEthernet10/0/1 2001:678:d78:201::2:01/112
set interface address GigabitEthernet10/0/1 192.168.10.6/31
set interface state GigabitEthernet10/0/1 up
comment { Gi10/0/2 is free to use }
set interface mtu 9216 GigabitEthernet10/0/2
set interface mtu packet 9000 GigabitEthernet10/0/2
set interface state GigabitEthernet10/0/2 down
comment { Gi10/0/3 is free to use }
set interface mtu 9216 GigabitEthernet10/0/3
set interface mtu packet 9000 GigabitEthernet10/0/3
set interface state GigabitEthernet10/0/3 down

23
overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp Normal file
View File

@ -0,0 +1,23 @@
comment { Gi10/0/0 is connected to vpp0-1:Gi10/0/1 }
set interface mtu 9216 GigabitEthernet10/0/0
set interface mtu packet 1500 GigabitEthernet10/0/0
set interface address GigabitEthernet10/0/0 2001:678:d78:201::2:02/112
set interface address GigabitEthernet10/0/0 192.168.10.7/31
set interface state GigabitEthernet10/0/0 up
comment { Gi10/0/1 is connected to vpp0-3:Gi10/0/0 }
set interface mtu 9216 GigabitEthernet10/0/1
set interface mtu packet 9000 GigabitEthernet10/0/1
set interface address GigabitEthernet10/0/1 2001:678:d78:201::3:02/112
set interface address GigabitEthernet10/0/0 192.168.10.8/31
set interface state GigabitEthernet10/0/1 up
comment { Gi10/0/2 is free to use }
set interface mtu 9216 GigabitEthernet10/0/2
set interface mtu packet 9000 GigabitEthernet10/0/2
set interface state GigabitEthernet10/0/2 down
comment { Gi10/0/3 is free to use }
set interface mtu 9216 GigabitEthernet10/0/3
set interface mtu packet 9000 GigabitEthernet10/0/3
set interface state GigabitEthernet10/0/3 down

21
overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp Normal file
View File

@ -0,0 +1,21 @@
comment { Gi10/0/0 is connected to vpp0-2:Gi0/0/1 }
set interface mtu 9216 GigabitEthernet10/0/0
set interface mtu packet 1500 GigabitEthernet10/0/0
set interface address GigabitEthernet10/0/0 2001:678:d78:201::2:03/112
set interface address GigabitEthernet10/0/0 192.168.10.9/31
set interface state GigabitEthernet10/0/0 up
comment { Gi10/0/1 is free to use }
set interface mtu 9216 GigabitEthernet10/0/1
set interface mtu packet 9000 GigabitEthernet10/0/1
set interface state GigabitEthernet10/0/1 down
comment { Gi10/0/2 is free to use }
set interface mtu 9216 GigabitEthernet10/0/2
set interface mtu packet 9000 GigabitEthernet10/0/2
set interface state GigabitEthernet10/0/2 down
comment { Gi10/0/3 is free to use }
set interface mtu 9216 GigabitEthernet10/0/3
set interface mtu packet 9000 GigabitEthernet10/0/3
set interface state GigabitEthernet10/0/3 down

38
overlays/bird/templates/etc/vpp/bootstrap.vpp.j2
View File

@ -1,38 +0,0 @@
set logging class linux-cp rate-limit 1000 level warn syslog-level notice
lcp default netns dataplane
lcp lcp-sync on
lcp lcp-auto-subint off
comment { Create a loopback interface }
create loopback interface instance 0
lcp create loop0 host-if loop0
set interface state loop0 up
set interface ip address loop0 {{ node.loopback.ipv4 }}
set interface ip address loop0 {{ node.loopback.ipv6 }}
comment { Create one LinuxCP Interface Pair for each phy }
lcp create GigabitEthernet10/0/0 host-if e0
lcp create GigabitEthernet10/0/1 host-if e1
lcp create GigabitEthernet10/0/2 host-if e2
lcp create GigabitEthernet10/0/3 host-if e3
comment { e0 is uplink to AS8298 }
set interface state GigabitEthernet10/0/0 up
set interface mtu packet 1500 GigabitEthernet10/0/0
set interface ip address GigabitEthernet10/0/0 192.168.10.7/31
set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112
comment { e1 is ptp with e0.vpp0-1 }
set interface state GigabitEthernet10/0/1 up
set interface mtu packet 9000 GigabitEthernet10/0/1
set interface ip address GigabitEthernet10/0/1 192.168.10.8/31
set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112
comment { e2 is free to use }
set interface state GigabitEthernet10/0/2 down
set interface mtu packet 9000 GigabitEthernet10/0/2
comment { e3 is free to use }
set interface state GigabitEthernet10/0/3 down
set interface mtu packet 9000 GigabitEthernet10/0/3