Move docker build stuff into a subdirectory. Update structure to retire manual-{pre,post}
This commit is contained in:
		
							
								
								
									
										1
									
								
								docker/files/etc/bird/bird-local.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								docker/files/etc/bird/bird-local.conf
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
# Containerlab user overrides go in this file.
 | 
			
		||||
							
								
								
									
										26
									
								
								docker/files/etc/bird/bird.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								docker/files/etc/bird/bird.conf
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,26 @@
 | 
			
		||||
# Bird2 configuration for VPP Containerlab
 | 
			
		||||
 | 
			
		||||
# router id 192.0.2.0;
 | 
			
		||||
 | 
			
		||||
timeformat base         iso long;
 | 
			
		||||
timeformat log          iso long;
 | 
			
		||||
timeformat protocol     iso long;
 | 
			
		||||
timeformat route        iso long;
 | 
			
		||||
 | 
			
		||||
log "/var/log/bird/bird.log" { debug, trace, info, remote, warning, error, auth, fatal, bug };
 | 
			
		||||
 | 
			
		||||
protocol device { scan time 30; }
 | 
			
		||||
 | 
			
		||||
protocol direct { ipv4; ipv6; check link yes; }
 | 
			
		||||
 | 
			
		||||
protocol kernel kernel4 {
 | 
			
		||||
  ipv4 { import none; export where source != RTS_DEVICE; };
 | 
			
		||||
  learn off; scan time 300;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
protocol kernel kernel6 {
 | 
			
		||||
  ipv6 { import none; export where source != RTS_DEVICE; };
 | 
			
		||||
  learn off; scan time 300;
 | 
			
		||||
}
 | 
			
		||||
        
 | 
			
		||||
include "bird-local.conf";
 | 
			
		||||
							
								
								
									
										2
									
								
								docker/files/etc/vpp/bootstrap.vpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								docker/files/etc/vpp/bootstrap.vpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,2 @@
 | 
			
		||||
exec /etc/vpp/clab.vpp
 | 
			
		||||
exec /etc/vpp/vppcfg.vpp
 | 
			
		||||
							
								
								
									
										1
									
								
								docker/files/etc/vpp/clab.vpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								docker/files/etc/vpp/clab.vpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
comment { This file will be overwritten / generated by containerlab upon deploy }
 | 
			
		||||
							
								
								
									
										50
									
								
								docker/files/etc/vpp/startup.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								docker/files/etc/vpp/startup.conf
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,50 @@
 | 
			
		||||
# This is the vpp-containerlab default startup.conf, which is meant to be
 | 
			
		||||
# overridden by Containerlab's node/fdio_vpp/vpp_startup_config.go.tpl
 | 
			
		||||
 | 
			
		||||
unix {
 | 
			
		||||
  interactive
 | 
			
		||||
  log /var/log/vpp/vpp.log
 | 
			
		||||
  full-coredump
 | 
			
		||||
  cli-listen /run/vpp/cli.sock
 | 
			
		||||
  cli-prompt vpp-clab#
 | 
			
		||||
  cli-no-pager
 | 
			
		||||
  poll-sleep-usec 100
 | 
			
		||||
  exec /etc/vpp/bootstrap.vpp
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
api-trace {
 | 
			
		||||
  on
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
memory {
 | 
			
		||||
  main-heap-size 512M
 | 
			
		||||
  main-heap-page-size 4k
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
buffers {
 | 
			
		||||
  buffers-per-numa 16000
 | 
			
		||||
  default data-size 2048
 | 
			
		||||
  page-size 4k
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
statseg {
 | 
			
		||||
  size 64M
 | 
			
		||||
  page-size 4k
 | 
			
		||||
  per-node-counters on
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
plugins {
 | 
			
		||||
  plugin default { enable }
 | 
			
		||||
  plugin dpdk_plugin.so { disable }
 | 
			
		||||
  plugin linux_cp_plugin.so { enable }
 | 
			
		||||
  plugin linux_nl_plugin.so { enable }
 | 
			
		||||
  plugin sflow_plugin.so { enable }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
linux-cp {
 | 
			
		||||
  default netns dataplane
 | 
			
		||||
  lcp-sync
 | 
			
		||||
  lcp-auto-subint
 | 
			
		||||
  del-static-on-link-down
 | 
			
		||||
  del-dynamic-on-link-down
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user