[docker-fpm-quagga]: Manage Quagga processes (zebra, bgpd) using supe…

…rvisor instead of watchquagga (#900)
sonic-net · Aug 21, 2017 · ed66588 · ed66588
1 parent a92f5a9
commit ed66588
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 42 deletions.
diff --git a/dockers/docker-fpm-quagga/Dockerfile.j2 b/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"]
diff --git a/dockers/docker-fpm-quagga/daemons b/dockers/docker-fpm-quagga/daemons
diff --git a/dockers/docker-fpm-quagga/start.sh b/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
diff --git a/dockers/docker-fpm-quagga/supervisord.conf b/dockers/docker-fpm-quagga/supervisord.conf
@@ -11,27 +11,42 @@ autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
-[program:rsyslogd]
-command=/usr/sbin/rsyslogd -n
+[program:bgpcfgd]
+command=/usr/bin/bgpcfgd
 priority=2
 autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
-[program:fpmsyncd]
-command=fpmsyncd
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n
 priority=3
 autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
-[program:bgpcfgd]
-command=/usr/bin/bgpcfgd
+[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
+stderr_logfile=syslog
+
+[program:fpmsyncd]
+command=fpmsyncd
+priority=6
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog