diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..7d51134 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.10.4 +nameserver 2001:678:d78:201::ffff diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml index e97a348..9e37526 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.80/24, 2001:678:d78:101::80/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf index e69de29..ca1b910 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..7d51134 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.10.4 +nameserver 2001:678:d78:201::ffff diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml index bea2b4f..37abb53 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.81/24, 2001:678:d78:101::81/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf index e69de29..ca1b910 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..7d51134 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.10.4 +nameserver 2001:678:d78:201::ffff diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml index 5861047..47387c5 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.82/24, 2001:678:d78:101::82/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf index e69de29..ca1b910 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..7d51134 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.10.4 +nameserver 2001:678:d78:201::ffff diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml index fe65c2a..e5ebfd4 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.83/24, 2001:678:d78:101::83/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf index e69de29..ca1b910 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..7812d4d --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.11.4 +nameserver 2001:678:d78:211::ffff diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml index b142e74..581a008 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.84/24, 2001:678:d78:101::84/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf new file mode 100644 index 0000000..ca1b910 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ 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 \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ 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 \ No newline at end of file +lcp lcp-auto-subint off + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp index d912e2e..edeee34 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp @@ -1 +1 @@ -comment { This file is overridden by blobs/vpp1-0/etc/vpp/config/interfaces.vpp } \ No newline at end of file +comment { This file is overridden by blobs/vpp1-0/etc/vpp/config/interfaces.vpp } diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ 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 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp index 24d7fde..4d39398 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.11.0/32 -set interface ip address loop0 2001:678:d78:210::/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:210::/128 + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..18a442a --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-0 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..7812d4d --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.11.4 +nameserver 2001:678:d78:211::ffff diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml index d3f23a9..808d899 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.85/24, 2001:678:d78:101::85/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf new file mode 100644 index 0000000..ca1b910 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ 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 \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ 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 \ No newline at end of file +lcp lcp-auto-subint off + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp index 71b0fae..9fb86fe 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp @@ -1 +1 @@ -comment { This file is overridden by blobs/vpp1-1/etc/vpp/config/interfaces.vpp } \ No newline at end of file +comment { This file is overridden by blobs/vpp1-1/etc/vpp/config/interfaces.vpp } diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ 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 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp index b7a52f9..c22db9d 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.11.1/32 -set interface ip address loop0 2001:678:d78:210::1/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:210::1/128 + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..a7935ef --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-1 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..7812d4d --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.11.4 +nameserver 2001:678:d78:211::ffff diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml index f945223..2cc6ef6 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.86/24, 2001:678:d78:101::86/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf new file mode 100644 index 0000000..ca1b910 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ 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 \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ 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 \ No newline at end of file +lcp lcp-auto-subint off + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp index d965f09..010a509 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp @@ -1 +1 @@ -comment { This file is overridden by blobs/vpp1-2/etc/vpp/config/interfaces.vpp } \ No newline at end of file +comment { This file is overridden by blobs/vpp1-2/etc/vpp/config/interfaces.vpp } diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ 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 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp index 443d817..3211182 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.11.2/32 -set interface ip address loop0 2001:678:d78:210::2/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:210::2/128 + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..8416868 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-2 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..7812d4d --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.11.4 +nameserver 2001:678:d78:211::ffff diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml index 9b325fa..acc06fb 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.87/24, 2001:678:d78:101::87/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf new file mode 100644 index 0000000..ca1b910 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ 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 \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ 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 \ No newline at end of file +lcp lcp-auto-subint off + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp index 769b96b..6bb127c 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp @@ -1 +1 @@ -comment { This file is overridden by blobs/vpp1-3/etc/vpp/config/interfaces.vpp } \ No newline at end of file +comment { This file is overridden by blobs/vpp1-3/etc/vpp/config/interfaces.vpp } diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ 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 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp index 3ddec1f..bb07712 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.11.3/32 -set interface ip address loop0 2001:678:d78:210::3/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:210::3/128 + diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..c4d4763 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-3 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..22cdc45 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.12.4 +nameserver 2001:678:d78:221::ffff diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml index 66fab27..2b69d98 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.88/24, 2001:678:d78:101::88/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf new file mode 100644 index 0000000..ca1b910 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ 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 \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ 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 \ No newline at end of file +lcp lcp-auto-subint off + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp index 8dd3d41..5096b77 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp @@ -1 +1 @@ -comment { This file is overridden by blobs/vpp2-0/etc/vpp/config/interfaces.vpp } \ No newline at end of file +comment { This file is overridden by blobs/vpp2-0/etc/vpp/config/interfaces.vpp } diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ 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 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp index 336568a..5b974ce 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.12.0/32 -set interface ip address loop0 2001:678:d78:220::/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:220::/128 + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/manual.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..1e73a8f --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp2-0 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..22cdc45 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.12.4 +nameserver 2001:678:d78:221::ffff diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml index 71b8d80..a62d482 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.89/24, 2001:678:d78:101::89/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf new file mode 100644 index 0000000..ca1b910 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ 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 \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ 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 \ No newline at end of file +lcp lcp-auto-subint off + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp index a26ef2f..4024f8e 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp @@ -1 +1 @@ -comment { This file is overridden by blobs/vpp2-1/etc/vpp/config/interfaces.vpp } \ No newline at end of file +comment { This file is overridden by blobs/vpp2-1/etc/vpp/config/interfaces.vpp } diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ 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 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp index 8d49807..0b1ed03 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.12.1/32 -set interface ip address loop0 2001:678:d78:220::1/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:220::1/128 + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/manual.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..e032bea --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp2-1 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..22cdc45 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.12.4 +nameserver 2001:678:d78:221::ffff diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml index 5858144..120ff95 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.90/24, 2001:678:d78:101::8a/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf new file mode 100644 index 0000000..ca1b910 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ 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 \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ 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 \ No newline at end of file +lcp lcp-auto-subint off + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp index b048bf0..eddc3c7 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp @@ -1 +1 @@ -comment { This file is overridden by blobs/vpp2-2/etc/vpp/config/interfaces.vpp } \ No newline at end of file +comment { This file is overridden by blobs/vpp2-2/etc/vpp/config/interfaces.vpp } diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ 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 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp index 1b53875..90a007f 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.12.2/32 -set interface ip address loop0 2001:678:d78:220::2/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:220::2/128 + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/manual.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..ad5c6e9 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp2-2 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf new file mode 100644 index 0000000..22cdc45 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 192.168.12.4 +nameserver 2001:678:d78:221::ffff diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml index 219dde3..0b2dd13 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml @@ -9,6 +9,3 @@ network: addresses: [ 192.168.1.91/24, 2001:678:d78:101::8b/64 ] gateway4: 192.168.1.252 gateway6: 2001:678:d78:101::1 - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf new file mode 100644 index 0000000..ca1b910 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf @@ -0,0 +1,4 @@ +domain lab.ipng.ch +search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl +nameserver 194.1.163.3 +nameserver 194.1.163.4 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ 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 \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ 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 \ No newline at end of file +lcp lcp-auto-subint off + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp index af19359..abc8936 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp @@ -1 +1 @@ -comment { This file is overridden by blobs/vpp2-3/etc/vpp/config/interfaces.vpp } \ No newline at end of file +comment { This file is overridden by blobs/vpp2-3/etc/vpp/config/interfaces.vpp } diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ 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 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp index 82448c3..5df6b09 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.12.3/32 -set interface ip address loop0 2001:678:d78:220::3/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:220::3/128 + diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/manual.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..84c9672 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp2-3 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/config/common/generic.yaml b/config/common/generic.yaml index 6fb629a..b25c5c2 100644 --- a/config/common/generic.yaml +++ b/config/common/generic.yaml @@ -10,3 +10,13 @@ overlays: frr: path: overlays/frr/ build: build/frr/ + +lab: + mgmt: + ipv4: 192.168.1.80/24 + ipv6: 2001:678:d78:101::80/64 + gw4: 192.168.1.252 + gw6: 2001:678:d78:101::1 + nameserver: + search: [ "lab.ipng.ch", "ipng.ch", "rfc1918.ipng.nl", "ipng.nl" ] + nodes: 4 diff --git a/config/hvn0.lab.ipng.ch.yaml b/config/hvn0.lab.ipng.ch.yaml index 2cf7896..144a49a 100644 --- a/config/hvn0.lab.ipng.ch.yaml +++ b/config/hvn0.lab.ipng.ch.yaml @@ -1,11 +1,7 @@ lab: id: 0 - mgmt: - ipv4: 192.168.1.80/24 - ipv6: 2001:678:d78:101::80/64 - gw4: 192.168.1.252 - gw6: 2001:678:d78:101::1 ipv4: 192.168.10.0/24 ipv6: 2001:678:d78:200::/60 + nameserver: + addresses: [ 192.168.10.4, 2001:678:d78:201::ffff ] hypervisor: hvn0.lab.ipng.ch - nodes: 4 diff --git a/config/hvn1.lab.ipng.ch.yaml b/config/hvn1.lab.ipng.ch.yaml index e410324..2d0250a 100644 --- a/config/hvn1.lab.ipng.ch.yaml +++ b/config/hvn1.lab.ipng.ch.yaml @@ -1,11 +1,7 @@ lab: id: 1 - mgmt: - ipv4: 192.168.1.80/24 - ipv6: 2001:678:d78:101::80/64 - gw4: 192.168.1.252 - gw6: 2001:678:d78:101::1 ipv4: 192.168.11.0/24 ipv6: 2001:678:d78:210::/60 + nameserver: + addresses: [ 192.168.11.4, 2001:678:d78:211::ffff ] hypervisor: hvn1.lab.ipng.ch - nodes: 4 diff --git a/config/hvn2.lab.ipng.ch.yaml b/config/hvn2.lab.ipng.ch.yaml index 0b43a96..d58bfe9 100644 --- a/config/hvn2.lab.ipng.ch.yaml +++ b/config/hvn2.lab.ipng.ch.yaml @@ -1,11 +1,7 @@ lab: id: 2 - mgmt: - ipv4: 192.168.1.80/24 - ipv6: 2001:678:d78:101::80/64 - gw4: 192.168.1.252 - gw6: 2001:678:d78:101::1 ipv4: 192.168.12.0/24 ipv6: 2001:678:d78:220::/60 + nameserver: + addresses: [ 192.168.12.4, 2001:678:d78:221::ffff ] hypervisor: hvn1.lab.ipng.ch - nodes: 4 diff --git a/overlays/bird/common/etc/netns/dataplane/resolv.conf.j2 b/overlays/bird/common/etc/netns/dataplane/resolv.conf.j2 new file mode 100644 index 0000000..103749f --- /dev/null +++ b/overlays/bird/common/etc/netns/dataplane/resolv.conf.j2 @@ -0,0 +1,7 @@ +domain lab.ipng.ch +search{% for domain in lab.nameserver.search %} {{domain}}{%endfor %} + +{% for resolver in lab.nameserver.addresses %} +nameserver {{resolver}} +{%endfor%} + diff --git a/overlays/bird/common/etc/netplan/01-netcfg.yaml.j2 b/overlays/bird/common/etc/netplan/01-netcfg.yaml.j2 index beaa5f4..dc2cf10 100644 --- a/overlays/bird/common/etc/netplan/01-netcfg.yaml.j2 +++ b/overlays/bird/common/etc/netplan/01-netcfg.yaml.j2 @@ -9,6 +9,4 @@ network: addresses: [ {{node.mgmt.ipv4}}, {{node.mgmt.ipv6}} ] gateway4: {{lab.mgmt.gw4}} gateway6: {{lab.mgmt.gw6}} - nameservers: - addresses: [ "2001:678:d78::3", "2001:678:d78::4" ] - search: [ "lab.ipng.ch", "ipng.ch", "ipng.nl", "rfc1918.ipng.nl" ] + diff --git a/overlays/bird/common/etc/resolv.conf.j2 b/overlays/bird/common/etc/resolv.conf.j2 new file mode 100644 index 0000000..fbce15d --- /dev/null +++ b/overlays/bird/common/etc/resolv.conf.j2 @@ -0,0 +1,6 @@ +domain lab.ipng.ch +search{% for domain in lab.nameserver.search %} {{domain}}{%endfor %} + +nameserver 194.1.163.3 +nameserver 194.1.163.4 +