From b13488c319c5d6077553043c0810d2c4f06a99ed Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sat, 4 Nov 2017 19:00:04 +0000 Subject: [PATCH 1/5] [vs]: add zebra/quagga/fpmsyncd in supervisord.conf --- platform/vs/docker-sonic-vs/start.sh | 2 ++ platform/vs/docker-sonic-vs/supervisord.conf | 24 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index 07d0fb7a042..0782705bc91 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -28,6 +28,8 @@ supervisorctl start neighsyncd supervisorctl start teamsyncd +supervisorctl start fpmsyncd + # 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 c6fefef1415..c91d808b985 100644 --- a/platform/vs/docker-sonic-vs/supervisord.conf +++ b/platform/vs/docker-sonic-vs/supervisord.conf @@ -74,3 +74,27 @@ autostart=false autorestart=false stdout_logfile=syslog stderr_logfile=syslog + +[program:zebra] +command=/usr/lib/quagga/zebra -A 127.0.0.1 +priority=10 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog + +[program:bgpd] +command=/usr/lib/quagga/bgpd -A 127.0.0.1 -F +priority=11 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog + +[program:fpmsyncd] +command=/usr/bin/fpmsyncd +priority=12 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog From d7f6b60ff43813e9196fe0f8ed50c220cc787785 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Mon, 6 Nov 2017 21:09:34 +0000 Subject: [PATCH 2/5] setup the hostname for vs docker --- platform/vs/docker-sonic-vs/Dockerfile.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2 index 32b91e8cf44..499de7626c4 100644 --- a/platform/vs/docker-sonic-vs/Dockerfile.j2 +++ b/platform/vs/docker-sonic-vs/Dockerfile.j2 @@ -54,4 +54,7 @@ COPY ["start.sh", "orchagent.sh", "/usr/bin/"] COPY ["brcm.profile.ini", "/usr/share/sonic/device/vswitch/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] +RUN echo "docker-sonic-vs" > /etc/hostname +RUN hostname -F /etc/hostname + ENTRYPOINT ["/usr/bin/supervisord"] From 3e1bd33c8f9aa608db47183722f31a3a9f6c0402 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Tue, 7 Nov 2017 07:52:35 +0000 Subject: [PATCH 3/5] do not save to the disk for redis db --- platform/vs/docker-sonic-vs/Dockerfile.j2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2 index 499de7626c4..151d9dd1bd1 100644 --- a/platform/vs/docker-sonic-vs/Dockerfile.j2 +++ b/platform/vs/docker-sonic-vs/Dockerfile.j2 @@ -43,10 +43,12 @@ debs/{{ deb }}{{' '}} RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y RUN rm -rf /debs -RUN sed -ri 's/^daemonize yes$/daemonize no/; \ +RUN sed -ri 's/^(save .*$)/# \1/g; \ + s/^daemonize yes$/daemonize no/; \ s/^logfile .*$/logfile ""/; \ s/^# syslog-enabled no$/syslog-enabled no/; \ - s/^# unixsocket/unixsocket/ \ + s/^# unixsocket/unixsocket/; \ + s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/ \ ' /etc/redis/redis.conf COPY ["50-default.conf", "/etc/rsyslog.d/"] @@ -55,6 +57,5 @@ COPY ["brcm.profile.ini", "/usr/share/sonic/device/vswitch/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] RUN echo "docker-sonic-vs" > /etc/hostname -RUN hostname -F /etc/hostname ENTRYPOINT ["/usr/bin/supervisord"] From e09853922e47daf68b65969cacc6a48fc831e22b Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sun, 12 Nov 2017 21:39:36 +0000 Subject: [PATCH 4/5] install ipaddress module in vs docker --- platform/vs/docker-sonic-vs/Dockerfile.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2 index 151d9dd1bd1..fe6ca837a11 100644 --- a/platform/vs/docker-sonic-vs/Dockerfile.j2 +++ b/platform/vs/docker-sonic-vs/Dockerfile.j2 @@ -28,6 +28,9 @@ RUN apt-get install -y net-tools \ iproute \ libpython2.7 +RUN pip install setuptools \ + py2_ipaddress + COPY \ {% for deb in docker_sonic_vs_debs.split(' ') -%} debs/{{ deb }}{{' '}} From 1ba7d6e96839f74033b185ec5833f61ff681ad8d Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Mon, 13 Nov 2017 17:31:33 +0000 Subject: [PATCH 5/5] update sonic-sairedis submodule --- src/sonic-sairedis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index f5d9c8364f5..d11f5501ff1 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit f5d9c8364f5fbcc487a5f1a3e3e6203ab2293a83 +Subproject commit d11f5501ff15cff7361c397ec937327ce343c94b