Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add nbrmgr to supervisor control #2265

Merged
merged 4 commits into from
Nov 29, 2018
Merged

Add nbrmgr to supervisor control #2265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08de36f
Add nbrmgr to supervisord conf
prsunny Nov 16, 2018
eb0d4d2
Corrected priority values [Fix typo]
prsunny Nov 21, 2018
c0f4ec9
Submodule update for Neighbor manager daemon
prsunny Nov 28, 2018
298da6f
Merge remote-tracking branch 'upstream/master' into nbrmgr
prsunny Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dockers/docker-orchagent/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions dockers/docker-orchagent/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@ autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:nbrmgrd]
command=/usr/bin/nbrmgrd
priority=15
prsunny marked this conversation as resolved.
Show resolved Hide resolved
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:restore_neighbors]
command=/usr/bin/restore_neighbors.py
priority=15
Expand Down
2 changes: 2 additions & 0 deletions platform/vs/docker-sonic-vs/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,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
Expand Down
8 changes: 8 additions & 0 deletions platform/vs/docker-sonic-vs/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@ autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:nbrmgrd]
command=/usr/bin/nbrmgrd
priority=19
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:restore_neighbors]
command=/usr/bin/restore_neighbors.py
priority=19
Expand Down