matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[docker-frr]: change default routing mode to separated and fix a bug in separated mode (#2961)

Browse Source 
In separated mode, frr requires to run vtysh_b to load individual configuration

Signed-off-by: Guohan Lu <gulv@microsoft.com>
This commit is contained in:
lguohan 2019-05-31 07:39:40 -07:00 committed by GitHub
parent 3f4de49e3d
commit 2a5bfe2bd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockers/docker-fpm-frr/start.sh
View File

@ -35,7 +35,7 @@ supervisorctl start zebra
supervisorctl start staticd supervisorctl start staticd
supervisorctl start bgpd supervisorctl start bgpd
if [ "$CONFIG_TYPE" == "unified" ]; then if [ -z "$CONFIG_TYPE" ] || [ "$CONFIG_TYPE" == "separated" ]; then
supervisorctl start vtysh_b supervisorctl start vtysh_b
fi fi

2
src/sonic-config-engine/minigraph.py
View File

@ -432,7 +432,7 @@ def parse_xml(filename, platform=None, port_config_file=None):
neighbors = None neighbors = None
devices = None devices = None
hostname = None hostname = None
docker_routing_config_mode = "unified" docker_routing_config_mode = "separated"
port_speeds_default = {} port_speeds_default = {}
port_speed_png = {} port_speed_png = {}
port_descriptions = {} port_descriptions = {}