From 2e86caaedb3b9a8c69d5fda0d46ba8c6124a9cf6 Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Wed, 24 Apr 2019 11:38:08 +0800 Subject: [PATCH] [vxlanmgrd]: Add vxlanmgrd start command (#2705) * Add bridge-utils to orchagent image - Add vxlanmgrd to supervisorctl in docker -orchagent Signed-off-by: Ze Gan zegan@microsoft.com * Update submodule pointer for swss to include Vxlanmgrd changes --- dockers/docker-orchagent/start.sh | 2 ++ dockers/docker-orchagent/supervisord.conf | 7 +++++++ platform/vs/docker-sonic-vs/start.sh | 2 ++ platform/vs/docker-sonic-vs/supervisord.conf | 8 ++++++++ src/sonic-swss | 2 +- 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh index b6c2d97d77..b7357ad58f 100755 --- a/dockers/docker-orchagent/start.sh +++ b/dockers/docker-orchagent/start.sh @@ -41,6 +41,8 @@ supervisorctl start enable_counters supervisorctl start nbrmgrd +supervisorctl start vxlanmgrd + # Start arp_update when VLAN exists VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'` if [ "$VLAN" != "" ]; then diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf index e6bfba3cb2..4479a27f2a 100644 --- a/dockers/docker-orchagent/supervisord.conf +++ b/dockers/docker-orchagent/supervisord.conf @@ -127,3 +127,10 @@ autorestart=false stdout_logfile=syslog stderr_logfile=syslog +[program:vxlanmgrd] +command=/usr/bin/vxlanmgrd +priority=16 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index 043753aa29..e8d062411f 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -63,6 +63,8 @@ supervisorctl start buffermgrd supervisorctl start nbrmgrd +supervisorctl start vxlanmgrd + # Start arp_update when VLAN exists VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'` if [ "$VLAN" != "" ]; then diff --git a/platform/vs/docker-sonic-vs/supervisord.conf b/platform/vs/docker-sonic-vs/supervisord.conf index c3d0ef4ab6..5b637e5070 100644 --- a/platform/vs/docker-sonic-vs/supervisord.conf +++ b/platform/vs/docker-sonic-vs/supervisord.conf @@ -164,3 +164,11 @@ autostart=false autorestart=false stdout_logfile=syslog stderr_logfile=syslog + +[program:vxlanmgrd] +command=/usr/bin/vxlanmgrd +priority=21 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog diff --git a/src/sonic-swss b/src/sonic-swss index e329dbdf66..d612d5e509 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit e329dbdf66d9bc4ca504e73ba589db8bc34cf997 +Subproject commit d612d5e50972e7f7574aaa5f24b5994e1194daaa