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

Add nbrmgr to supervisor control (#2265)

Browse Source 
* Add nbrmgr to supervisord conf

* Corrected priority values [Fix typo]

* Submodule update for Neighbor manager daemon

Submodule update sonic-swss-common:

edbfeec - Remove default docker name value of swss. (#250)
9728462 - Corrected configDB name for neigh table (#251)
6decc65 - Add NEIGH_TABLE to configDB for neighbor configuration (#249)
9918ae6 - Add ProducerStateTable temp view implementation and UT (#247)
41408f2 - Update README on dependencies
d9c0ba4 -Update README on the section 'Build with Google Test'
bb7fa5b - [ut]: explicit convert is to bool type (#248)
661b82c - Add gtest instruction in README

Submodule update sonic-swss

705b092 - Support ConfigDB neighbor configuration, introduce nbrmgr daemon (#693)
8522390 - Add vxlan switch attributes to switch orch (#712)
b123fa0 - [schema] update WARM_RESTART_TABLE:process_name schema document (#707)
2d7ab0c - Revert "Align default MTU value as SAI default (#705)" (#710)
836a58c - Align default MTU value as SAI default (#705)
bffa01f - VNET/VXLAN changes (#643)
b750a4b - [watermarkorch] add watermarkorch, extend queue and pg counters with wat\u2026 (#629)
This commit is contained in:
Prince Sunny 2018-11-28 21:58:59 -08:00 committed by lguohan
parent 1467434e4c
commit 43f6df4654
6 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockers/docker-orchagent/start.sh
View File

@ -41,6 +41,8 @@ supervisorctl start enable_counters
supervisorctl start vrfmgrd supervisorctl start vrfmgrd
supervisorctl start nbrmgrd
# Start arp_update when VLAN exists # Start arp_update when VLAN exists
VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'` VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
if [ "$VLAN" != "" ]; then if [ "$VLAN" != "" ]; then

8
dockers/docker-orchagent/supervisord.conf
View File

@ -127,3 +127,11 @@ startretries=0
stdout_logfile=syslog stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
[program:nbrmgrd]
command=/usr/bin/nbrmgrd
priority=16
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

2
platform/vs/docker-sonic-vs/start.sh
View File

@ -62,6 +62,8 @@ supervisorctl start buffermgrd
supervisorctl start vrfmgrd supervisorctl start vrfmgrd
supervisorctl start nbrmgrd
# Start arp_update when VLAN exists # Start arp_update when VLAN exists
VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'` VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
if [ "$VLAN" != "" ]; then if [ "$VLAN" != "" ]; then

8
platform/vs/docker-sonic-vs/supervisord.conf
View File

@ -164,3 +164,11 @@ startsecs=0
startretries=0 startretries=0
stdout_logfile=syslog stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
[program:nbrmgrd]
command=/usr/bin/nbrmgrd
priority=20
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

2
src/sonic-swss

@ -1 +1 @@
Subproject commit c74dc6079f49814ef290b65ed3e80b9cb27b310b Subproject commit 705b092719384fa9fa86a952805bfc698092e0ff

2
src/sonic-swss-common

@ -1 +1 @@
Subproject commit 2a37c5c7c4fdcc607613a534f9d0daedadea1f10 Subproject commit edbfeec663f32585cbf3468a88deb950fed3bb69