Advance to Debian 11.6 + VPP 23.06 + IPng Site Local

This commit is contained in:
Pim van Pelt
2023-04-03 15:15:42 +00:00
parent 20b518e298
commit d48828ed21
41 changed files with 70 additions and 70 deletions

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.10.4 nameserver 192.168.10.4
nameserver 2001:678:d78:201::ffff nameserver 2001:678:d78:201::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.80/24, 2001:678:d78:101::80/64 ] addresses: [ 198.19.5.16/27, 2001:678:d78:50b::10/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.10.4 nameserver 192.168.10.4
nameserver 2001:678:d78:201::ffff nameserver 2001:678:d78:201::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.81/24, 2001:678:d78:101::81/64 ] addresses: [ 198.19.5.17/27, 2001:678:d78:50b::11/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.10.4 nameserver 192.168.10.4
nameserver 2001:678:d78:201::ffff nameserver 2001:678:d78:201::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.82/24, 2001:678:d78:101::82/64 ] addresses: [ 198.19.5.18/27, 2001:678:d78:50b::12/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.10.4 nameserver 192.168.10.4
nameserver 2001:678:d78:201::ffff nameserver 2001:678:d78:201::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.83/24, 2001:678:d78:101::83/64 ] addresses: [ 198.19.5.19/27, 2001:678:d78:50b::13/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.11.4 nameserver 192.168.11.4
nameserver 2001:678:d78:211::ffff nameserver 2001:678:d78:211::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.84/24, 2001:678:d78:101::84/64 ] addresses: [ 198.19.5.20/27, 2001:678:d78:50b::14/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.11.4 nameserver 192.168.11.4
nameserver 2001:678:d78:211::ffff nameserver 2001:678:d78:211::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.85/24, 2001:678:d78:101::85/64 ] addresses: [ 198.19.5.21/27, 2001:678:d78:50b::15/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.11.4 nameserver 192.168.11.4
nameserver 2001:678:d78:211::ffff nameserver 2001:678:d78:211::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.86/24, 2001:678:d78:101::86/64 ] addresses: [ 198.19.5.22/27, 2001:678:d78:50b::16/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.11.4 nameserver 192.168.11.4
nameserver 2001:678:d78:211::ffff nameserver 2001:678:d78:211::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.87/24, 2001:678:d78:101::87/64 ] addresses: [ 198.19.5.23/27, 2001:678:d78:50b::17/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.12.4 nameserver 192.168.12.4
nameserver 2001:678:d78:221::ffff nameserver 2001:678:d78:221::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.88/24, 2001:678:d78:101::88/64 ] addresses: [ 198.19.5.24/27, 2001:678:d78:50b::18/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.12.4 nameserver 192.168.12.4
nameserver 2001:678:d78:221::ffff nameserver 2001:678:d78:221::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.89/24, 2001:678:d78:101::89/64 ] addresses: [ 198.19.5.25/27, 2001:678:d78:50b::19/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.12.4 nameserver 192.168.12.4
nameserver 2001:678:d78:221::ffff nameserver 2001:678:d78:221::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.90/24, 2001:678:d78:101::8a/64 ] addresses: [ 198.19.5.26/27, 2001:678:d78:50b::1a/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 192.168.12.4 nameserver 192.168.12.4
nameserver 2001:678:d78:221::ffff nameserver 2001:678:d78:221::ffff

View File

@ -6,6 +6,6 @@ network:
optional: true optional: true
accept-ra: false accept-ra: false
dhcp4: false dhcp4: false
addresses: [ 192.168.1.91/24, 2001:678:d78:101::8b/64 ] addresses: [ 198.19.5.27/27, 2001:678:d78:50b::1b/64 ]
gateway4: 192.168.1.252 gateway4: 198.19.5.1
gateway6: 2001:678:d78:101::1 gateway6: 2001:678:d78:50b::1

View File

@ -1,4 +1,4 @@
domain lab.ipng.ch domain lab.ipng.ch
search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl search lab.ipng.ch net.ipng.ch ipng.ch
nameserver 194.1.163.3 nameserver 194.1.163.3
nameserver 194.1.163.4 nameserver 194.1.163.4

View File

@ -13,10 +13,10 @@ overlays:
lab: lab:
mgmt: mgmt:
ipv4: 192.168.1.80/24 ipv4: 198.19.5.16/27
ipv6: 2001:678:d78:101::80/64 ipv6: 2001:678:d78:50b::10/64
gw4: 192.168.1.252 gw4: 198.19.5.1
gw6: 2001:678:d78:101::1 gw6: 2001:678:d78:50b::1
nameserver: nameserver:
search: [ "lab.ipng.ch", "ipng.ch", "rfc1918.ipng.nl", "ipng.nl" ] search: [ "lab.ipng.ch", "net.ipng.ch", "ipng.ch" ]
nodes: 4 nodes: 4

4
create
View File

@ -15,14 +15,14 @@
## * Unmount the staging directories ## * Unmount the staging directories
## * Start the VMs ## * Start the VMs
BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20221128-release} BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20230403-release}
BUILD=${BUILD:=default} BUILD=${BUILD:=default}
LAB=${LAB:=0} LAB=${LAB:=0}
## Do not touch below this line ## Do not touch below this line
LABDIR=/var/lab LABDIR=/var/lab
STAGING=$LABDIR/staging STAGING=$LABDIR/staging
HVN="hvn${LAB}-lab.chbtl0.net.ipng.ch" HVN="hvn${LAB}.lab.ipng.ch"
echo "* Cloning base" echo "* Cloning base"
ssh root@$HVN "set -x; for node in 0 1 2 3; do VM=vpp${LAB}-\${node}; mkdir -p $STAGING/\$VM; zfs clone $BASE ssd-vol0/\$VM; done" ssh root@$HVN "set -x; for node in 0 1 2 3; do VM=vpp${LAB}-\${node}; mkdir -p $STAGING/\$VM; zfs clone $BASE ssd-vol0/\$VM; done"

View File

@ -13,7 +13,7 @@ BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20221018-rele
LAB=${LAB:=0} LAB=${LAB:=0}
## Do not touch below this line ## Do not touch below this line
HVN="hvn${LAB}-lab.chbtl0.net.ipng.ch" HVN="hvn${LAB}.lab.ipng.ch"
echo "* Destroying VMs" echo "* Destroying VMs"
ssh root@$HVN "set -x; for node in 0 1 2 3; do VM=vpp${LAB}-\${node}; virsh destroy \$VM; done" ssh root@$HVN "set -x; for node in 0 1 2 3; do VM=vpp${LAB}-\${node}; virsh destroy \$VM; done"

View File

@ -3,7 +3,7 @@
LAB=${LAB:=0} LAB=${LAB:=0}
## Do not touch below this line ## Do not touch below this line
HVN="hvn${LAB}-lab.chbtl0.net.ipng.ch" HVN="hvn${LAB}.lab.ipng.ch"
## Destroy the VMs and bring them back into pristine state ## Destroy the VMs and bring them back into pristine state
echo "* Restarting VMs from pristine snapshot" echo "* Restarting VMs from pristine snapshot"

View File

@ -5,7 +5,7 @@ LAB=${LAB:=0}
## Do not touch below this line ## Do not touch below this line
LABDIR=/var/lab LABDIR=/var/lab
STAGING=$LABDIR/staging STAGING=$LABDIR/staging
HVN="hvn${LAB}-lab.chbtl0.net.ipng.ch" HVN="hvn${LAB}.lab.ipng.ch"
CMD=$1 CMD=$1
[ "$CMD" != "start" -a "$CMD" != "shutdown" -a "$CMD" != "destroy" ] && { [ "$CMD" != "start" -a "$CMD" != "shutdown" -a "$CMD" != "destroy" ] && {