From 8a5e6ac47d31ee5b513a6cf856e0e32fa1e58a42 Mon Sep 17 00:00:00 2001
From: Marian Pritsak <marianp@mellanox.com>
Date: Thu, 20 Sep 2018 08:18:39 +0300
Subject: [PATCH] [docker-orchagent]: Add vrfmgrd to supervisorctl (#2055)

* [docker-orchagent]: Add vrfmgrd to supervisorctl

Signed-off-by: Marian Pritsak <marianp@mellanox.com>

* [sonic-vs]: Add vrfmgrd to supervisorctl

Signed-off-by: Marian Pritsak <marianp@mellanox.com>
---
 dockers/docker-orchagent/start.sh            | 2 ++
 dockers/docker-orchagent/supervisord.conf    | 8 ++++++++
 platform/vs/docker-sonic-vs/start.sh         | 2 ++
 platform/vs/docker-sonic-vs/supervisord.conf | 8 ++++++++
 4 files changed, 20 insertions(+)

diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh
index 9249dc5c07..a0d4ad646b 100755
--- a/dockers/docker-orchagent/start.sh
+++ b/dockers/docker-orchagent/start.sh
@@ -32,6 +32,8 @@ supervisorctl start buffermgrd
 
 supervisorctl start enable_counters
 
+supervisorctl start vrfmgrd
+
 # 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 8f96037f11..6a0b18cb70 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -107,3 +107,11 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+
+[program:vrfmgrd]
+command=/usr/bin/vrfmgrd
+priority=14
+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 d16e9535c2..6180c0b66b 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -52,6 +52,8 @@ supervisorctl start zebra
 
 supervisorctl start buffermgrd
 
+supervisorctl start vrfmgrd
+
 # 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 1f6dfad60c..29283c7102 100644
--- a/platform/vs/docker-sonic-vs/supervisord.conf
+++ b/platform/vs/docker-sonic-vs/supervisord.conf
@@ -138,3 +138,11 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+
+[program:vrfmgrd]
+command=/usr/bin/vrfmgrd
+priority=18
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog