Add nbrmgr to supervisor control (#2265)

* 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)

dockers/docker-orchagent/start.sh

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

dockers/docker-orchagent/supervisord.conf

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

platform/vs/docker-sonic-vs/start.sh

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

platform/vs/docker-sonic-vs/supervisord.conf

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