[docker-fpm-quagga]: Manage Quagga processes (zebra, bgpd) using supervisor instead of watchquagga (#900)

dockers/docker-fpm-quagga/Dockerfile.j2

@@ -22,10 +22,8 @@ debs/{{ deb }}{{' '}}
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs
 
-COPY ["start.sh", "/usr/bin/"]
-COPY ["bgpcfgd", "/usr/bin/"]
+COPY ["bgpcfgd", "start.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["*.j2", "/usr/share/sonic/templates/"]
-COPY ["daemons", "/etc/quagga/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]

dockers/docker-fpm-quagga/daemons

@@ -1,31 +0,0 @@
-# This file tells the quagga package which daemons to start.
-#
-# Entries are in the format: <daemon>=(yes|no|priority)
-#   0, "no"  = disabled
-#   1, "yes" = highest priority
-#   2 .. 10  = lower priorities
-# Read /usr/share/doc/quagga/README.Debian for details.
-#
-# Sample configurations for these daemons can be found in
-# /usr/share/doc/quagga/examples/.
-#
-# ATTENTION: 
-#
-# When activation a daemon at the first time, a config file, even if it is
-# empty, has to be present *and* be owned by the user and group "quagga", else
-# the daemon will not be started by /etc/init.d/quagga. The permissions should
-# be u=rw,g=r,o=.
-# When using "vtysh" such a config file is also needed. It should be owned by
-# group "quaggavty" and set to ug=rw,o= though. Check /etc/pam.d/quagga, too.
-#
-# The watchquagga daemon is always started. Per default in monitoring-only but
-# that can be changed via /etc/quagga/debian.conf.
-#
-zebra=yes
-bgpd=yes
-ospfd=no
-ospf6d=no
-ripd=no
-ripngd=no
-isisd=no
-babeld=no

dockers/docker-fpm-quagga/start.sh

@@ -22,7 +22,8 @@ supervisorctl start bgpcfgd
 
 supervisorctl start rsyslogd
 
-# Quagga has its own monitor process, 'watchquagga'
-service quagga start
+# Start Quagga processes
+supervisorctl start zebra
+supervisorctl start bgpd
 
 supervisorctl start fpmsyncd

dockers/docker-fpm-quagga/supervisord.conf

@@ -11,9 +11,33 @@ autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
+[program:bgpcfgd]
+command=/usr/bin/bgpcfgd
+priority=2
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
-priority=2
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:zebra]
+command=/usr/lib/quagga/zebra -A 127.0.0.1
+priority=4
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
+[program:bgpd]
+command=/usr/lib/quagga/bgpd -A 127.0.0.1
+priority=5
 autostart=false
 autorestart=false
 stdout_logfile=syslog
@@ -21,17 +45,8 @@ stderr_logfile=syslog
 
 [program:fpmsyncd]
 command=fpmsyncd
-priority=3
+priority=6
 autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
-[program:bgpcfgd]
-command=/usr/bin/bgpcfgd
-priority=4
-autostart=false
-autorestart=false
-stdout_logfile=syslog
-stderr_logfile=syslog
-